Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Emotion] Convert EuiColorPalettePicker and EuiColorPaletteDisplay #7854

Merged

Conversation

cee-chen
Copy link
Contributor

@cee-chen cee-chen commented Jun 25, 2024

Summary

Note

This PR merges into a feature branch.

I recommend code reviewing by commit for this PR!

QA

The below links should look the same as before with no UI/visual regressions:

General checklist

  • Browser QA
    • Checked in both light and dark modes
    • Checked in mobile
    • Checked in Chrome, Safari, Edge, and Firefox
      - [ ] Checked for accessibility including keyboard-only and screenreader modes
  • Docs site QA - N/A
  • Code quality checklist
  • Release checklist
    • A changelog entry exists and is marked appropriately.
      - [ ] If applicable, added the breaking change issue label (and filled out the breaking change checklist)
  • Designer checklist - N/A
Emotion checklist

General

  • Output CSS matches the previous CSS (works as expected in all browsers)
  • Rendered className(s) read as expected in snapshots and browsers
  • [ ] Checked component playground No playground

Unit tests

  • shouldRenderCustomStyles() test was added and passes with parent component and any nested childProps (e.g. tooltipProps)
  • Converted Enzyme tests to RTL

Sass/Emotion conversion process

  • Converted all global Sass vars/mixins to JS (e.g. $euiSize to euiTheme.size.base)
  • Listed var/mixin removals in changelog
  • Removed or converted component-specific Sass vars/mixins to exported JS versions
  • Removed component from src/components/index.scss
  • [ ] Ran yarn compile-scss to update var/mixin JSON files
  • [ ] Simplified calc() to mathWithUnits if possible (if mixing different unit types, this may not be possible)
  • [ ] Deleted any src/amsterdam/overrides/{component}.scss files (styles within should have been converted to the baseline Emotion styles)
  • [ ] Added an @warn deprecation message within the global_styling/mixins/{component}.scss file

CSS tech debt

  • [ ] Wrapped all animations or transitions in euiCanAnimate
  • [ ] Used gap property to add margin between items if using flex
  • Converted side specific padding, margin, and position to -inline and -block logical properties (check inline styles as well as CSS)

DOM Cleanup

  • Did NOT remove any block/element classNames (e.g. euiComponent, euiComponent__child)
  • SEARCH KIBANA FIRST: Deleted any modifier classNames or maps if not being used in Kibana.
    • Removed .euiColorPaletteDisplay--[size] - no usages

Kibana due diligence

  • Search Kibana's codebase for {euiComponent}- (case sensitive) to check for usage of modifier classes - None
    • [ ] If usage exists, consider converting to a data attribute so that consumers still have something to hook into
  • Pre-emptively check how your conversion will impact the next Kibana upgrade. This entails searching/grepping through Kibana (excluding **/target, **/*.snap, **/*.storyshot for less noise) for eui{Component} (case sensitive) to find:
  • Any test/query selectors that will need to be updated. - None
  • Any Sass or CSS that will need to be updated, particularly if a component Sass var was deleted
  • Any direct className usages that will need to be refactored (e.g. someone calling the euiBadge class on a div instead of simply using the EuiBadge component) - None

There's a single custom CSS euiColorPaletteDisplay override, but it shouldn't be impacted by this PR


Extras/nice-to-have

  • Reduced specificity where possible (usually by reducing nesting and class name chaining)
  • [ ] Optional component/code cleanup: consider splitting up the component into multiple children if it's overly verbose or difficult to reason about
  • [ ] Documentation pass
  • [ ] Check for issues in the backlog that could be a quick fix for that component

@cee-chen cee-chen force-pushed the emotion/color-picker-3 branch from aa4f13a to a5ff8f6 Compare June 25, 2024 20:29
@cee-chen cee-chen marked this pull request as ready for review June 25, 2024 22:06
@cee-chen cee-chen requested a review from a team as a code owner June 25, 2024 22:06
import { CommonProps } from '../../common';
import { EuiSpacer } from '../../spacer';
import { EuiText } from '../../text';
import { EuiSuperSelect, type EuiSuperSelectProps } from '../../form';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is weird: Changing the import like this results in the props not being passed along to the Storybook controls table 🤯 Only the ones manually defined as args are added but they lose their docgenInfo because it's not actually resolved.

Maybe it's the level of abstraction also here. '../../form' adds one more export file that the import goes through to resolve 🤔 But changing the path for it in /form/index to /super_select/super_select does not work. 🤷‍♀️

before
Screenshot 2024-06-26 at 12 01 16

current
Screenshot 2024-06-26 at 12 01 05

I saw this comment and can also reproduce this: The props are properly resolved when declaring components with function instead of const 🙈

Digging a bit further and seeing this issue, I can also confirm that this is also true in this case:

// does not work
export const SomeComponent: FunctionComponent<Props> = ({
  propA,
  propB,
  ...rest
}) => {}

// does work
export const SomeComponent = ({
  propA,
  propB,
  ...rest
}: Props) => {}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoaaa what the heck. I changed the import path to forms/super_select and it started working again :| NO idea why. What on earth. I left a comment so hopefully that helps at least??

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I think for now that's fine. 👍 Eventually I guess we might need to look at this limitation around resolving types that we keep running into with Storybook, or rather react-docgen-typescript 🫣

Copy link

@zjfresh zjfresh Jul 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because React is not an ESM package, if using React.memo or React.ReactNode, etc., in the file, the TypeScript compiler used by react-docgen-typescript cannot recognize the type.

An easy solution is to replace the import: import React from 'react' with import * as React from 'react'.

The final solution is to replace the use of react-docgen-typescript with withDefaultConfig(parserOpts) by:

- import { withDefaultConfig } from 'react-docgen-typescript';
+ import { withCompilerOptions } from 'react-docgen-typescript';
import { defaultOptions } from 'react-docgen-typescript/lib/parser';
- withDefaultConfig(parserOpts).parseWithProgramProvider
+ withCompilerOptions(
+   /* tsconfig compilerOptions */
+   {
+     ...defaultOptions,
+     /* Either of these two is useful */
+     esModuleInterop: true,
+     allowSyntheticDefaultImports: true,
+   },
+   /* your parserOpts */
+   parserOpts
+  ).parseWithProgramProvider

@cee-chen cee-chen force-pushed the emotion/color-pickers branch from 38b92ac to 2e46b04 Compare June 26, 2024 20:40
cee-chen added 10 commits June 26, 2024 13:43
- doesn't need CSS at all! whoa!
- convert Enzyme to RTL + snapshot the popover
- remove need for passing a size to by simply using the `inherit` CSS property
- remove mixin

- ignore light/dark arg, appears to be unused
- remove modifier maps, no Kibana usages

- remove Sass variables

- remove unnecessary nested bleed area height CSS by inheriting `height: 100%` from the parent
- can be a static const, no EUI variables being used

- switch to position inset of height/width for simplicity

- it's unclear if the 1px offset/workaround is due to an actual EUI var so I'm leaving it as a static 1px
@cee-chen cee-chen force-pushed the emotion/color-picker-3 branch from e1feba7 to 29a4697 Compare June 26, 2024 21:32
@kibanamachine
Copy link

Preview staging links for this PR:

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

Copy link
Contributor

@mgadewoll mgadewoll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢 🐈‍⬛ Looking good to me!

@cee-chen
Copy link
Contributor Author

Thanks Lene!!

@cee-chen cee-chen merged commit 608f7b3 into elastic:emotion/color-pickers Jun 27, 2024
4 checks passed
@cee-chen cee-chen deleted the emotion/color-picker-3 branch June 27, 2024 15:51
tkajtoch added a commit to elastic/kibana that referenced this pull request Jul 13, 2024
`v95.2.0`⏩`v95.3.0`

_[Questions? Please see our Kibana upgrade
FAQ.](https://github.com/elastic/eui/blob/main/wiki/eui-team-processes/upgrading-kibana.md#faq-for-kibana-teams)_

---

## [`v95.3.0`](https://github.com/elastic/eui/releases/v95.3.0)

- Updated `EuiThemeProvider`s to allow modifying/setting custom
`breakpoint`s in nested usage (as opposed to only at the top
`EuiProvider` level) ([#7862](elastic/eui#7862))

**Bug fixes**

- Fixed a Chrome/Edge CSS `mask-image` bug that was affecting scroll
overflow shadow utilties
([#7855](elastic/eui#7855))

**CSS-in-JS conversions**

- Converted `EuiColorPicker` to Emotion; Removed `$euiColorPickerWidth`
([#7845](elastic/eui#7845))
- Converted `EuiColorPickerSwatch` to Emotion
([#7853](elastic/eui#7853))
- Converted `EuiColorPalettePicker` and `EuiColorPaletteDisplay` to
Emotion ([#7854](elastic/eui#7854))
  - Removed `$euiColorPaletteDisplaySizes`
  - Removed `@mixin euiColorPaletteInnerBorder`
- Removed `$euiColorPickerValueRange0`, `$euiColorPickerValueRange1`,
`$euiColorPickerSaturationRange0`, `$euiColorPickerSaturationRange1`,
and `$euiColorPickerIndicatorSize`
([#7859](elastic/eui#7859))

**Accessibility**

- Updated the `aria-label` attribute for the `EuiFilePicker` remove file
button ([#7860](elastic/eui#7860))

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
cee-chen pushed a commit to cee-chen/kibana that referenced this pull request Sep 12, 2024
`v95.2.0`⏩`v95.3.0`

_[Questions? Please see our Kibana upgrade
FAQ.](https://github.com/elastic/eui/blob/main/wiki/eui-team-processes/upgrading-kibana.md#faq-for-kibana-teams)_

---

- Updated `EuiThemeProvider`s to allow modifying/setting custom
`breakpoint`s in nested usage (as opposed to only at the top
`EuiProvider` level) ([elastic#7862](elastic/eui#7862))

**Bug fixes**

- Fixed a Chrome/Edge CSS `mask-image` bug that was affecting scroll
overflow shadow utilties
([elastic#7855](elastic/eui#7855))

**CSS-in-JS conversions**

- Converted `EuiColorPicker` to Emotion; Removed `$euiColorPickerWidth`
([elastic#7845](elastic/eui#7845))
- Converted `EuiColorPickerSwatch` to Emotion
([elastic#7853](elastic/eui#7853))
- Converted `EuiColorPalettePicker` and `EuiColorPaletteDisplay` to
Emotion ([elastic#7854](elastic/eui#7854))
  - Removed `$euiColorPaletteDisplaySizes`
  - Removed `@mixin euiColorPaletteInnerBorder`
- Removed `$euiColorPickerValueRange0`, `$euiColorPickerValueRange1`,
`$euiColorPickerSaturationRange0`, `$euiColorPickerSaturationRange1`,
and `$euiColorPickerIndicatorSize`
([elastic#7859](elastic/eui#7859))

**Accessibility**

- Updated the `aria-label` attribute for the `EuiFilePicker` remove file
button ([elastic#7860](elastic/eui#7860))

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants