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.

Sign up for GitHub

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

Jump to bottom

fix: move SetThemeScript and themeHelper from styled to react #701

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: move SetThemeScript and themeHelper from styled to react #701

wants to merge 3 commits into from
+21 −5

Conversation

yue4u
Copy link
Contributor

@yue4u yue4u commented Feb 19, 2025 •
edited
Loading

やったこと

  • SetThemeScript と themeHelperは非styled依存なのでreact側に移した
  • styledはreactのpeerDependencyにした

動作確認環境

チェックリスト

不要なチェック項目は消して構いません

  • 破壊的変更がある場合には、対象のパッケージのメジャーバージョンが上がっていることを確認した
  • 追加したコンポーネントが index.ts から再 export されている
  • README やドキュメントに影響があることを確認した

@yue4u yue4u added the minor label Feb 19, 2025
@yue4u yue4u temporarily deployed to preview-channel February 19, 2025 08:39 — with GitHub Actions Inactive
yue4u
yue4u commented Feb 19, 2025
View reviewed changes
packages/styled/package.json
@@ -44,6 +45,7 @@
"warning": "^4.0.3"
},
"peerDependencies": {
"@charcoal-ui/react": "^4.2.1",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ここバージョンアップで更新されるかやや不安

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 19, 2025 •
edited
Loading

Visit the preview URL for this PR (updated for commit f7f5a23):

https://pixiv-charcoal-web--pr701-fix-move-setthemescr-xzpp5o7e.web.app

(expires Wed, 26 Feb 2025 09:03:22 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: 314b26d3adca98a761c7e4d9922ebb206ff024a0

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 19, 2025 •
edited
Loading

Size Change: +1.45 kB (+0.26%)

Total Size: 554 kB

Filename Size Change
./packages/react/dist/index.cjs.js 57.6 kB +5.03 kB (+9.55%) ⚠️
./packages/react/dist/index.d.ts 2.1 kB +233 B (+12.51%) ⚠️
./packages/react/dist/index.esm.js 51.7 kB +4.53 kB (+9.6%) ⚠️
./packages/styled/dist/helper.d.ts 0 B -2.05 kB (removed) 🏆
./packages/styled/dist/index.cjs.js 26.7 kB -4.27 kB (-13.77%) 👏
./packages/styled/dist/index.d.ts 6.9 kB +16 B (+0.23%)
./packages/styled/dist/index.esm.js 23.6 kB -4.09 kB (-14.78%) 👏
./packages/styled/dist/SetThemeScript.d.ts 0 B -933 B (removed) 🏆
./packages/react/dist/core/SetThemeScript.d.ts 933 B +933 B (new file) 🆕
./packages/react/dist/core/themeHelper.d.ts 2.05 kB +2.05 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size
./packages/foundation/dist/border-radius.d.ts 692 B
./packages/foundation/dist/breakpoint.d.ts 225 B
./packages/foundation/dist/color.d.ts 171 B
./packages/foundation/dist/effect.d.ts 1.08 kB
./packages/foundation/dist/grid.d.ts 396 B
./packages/foundation/dist/index.cjs.js 2.82 kB
./packages/foundation/dist/index.d.ts 230 B
./packages/foundation/dist/index.esm.js 1.44 kB
./packages/foundation/dist/spacing.d.ts 305 B
./packages/foundation/dist/typography.d.ts 790 B
./packages/icons-cli/dist/index.js 20.3 kB
./packages/icons/dist/charcoalIconFiles.d.ts 4.78 kB
./packages/icons/dist/index.cjs.js 9.38 kB
./packages/icons/dist/index.d.ts 478 B
./packages/icons/dist/index.esm.js 7.93 kB
./packages/icons/dist/loaders/CharcoalIconFilesLoader.d.ts 7.54 kB
./packages/icons/dist/loaders/CustomIconLoader.d.ts 417 B
./packages/icons/dist/loaders/index.d.ts 181 B
./packages/icons/dist/loaders/Loadable.d.ts 98 B
./packages/icons/dist/loaders/PixivIconLoadError.d.ts 153 B
./packages/icons/dist/PixivIcon.d.ts 1.55 kB
./packages/icons/dist/PixivIcon.story.d.ts 428 B
./packages/icons/dist/PixivIcon.test.d.ts 55 B
./packages/icons/dist/ssr.d.ts 75 B
./packages/pullrequest-cli/dist/index.js 6.9 kB
./packages/react-sandbox/dist/_lib/compat.d.ts 427 B
./packages/react-sandbox/dist/_lib/ComponentAbstraction.d.ts 967 B
./packages/react-sandbox/dist/components/Carousel/index.d.ts 1.38 kB
./packages/react-sandbox/dist/components/CarouselButton/index.d.ts 675 B
./packages/react-sandbox/dist/components/Filter/index.d.ts 1.05 kB
./packages/react-sandbox/dist/components/HintText/index.d.ts 326 B
./packages/react-sandbox/dist/components/icons/Base.d.ts 762 B
./packages/react-sandbox/dist/components/icons/DotsIcon.d.ts 310 B
./packages/react-sandbox/dist/components/icons/InfoIcon.d.ts 115 B
./packages/react-sandbox/dist/components/icons/NextIcon.d.ts 309 B
./packages/react-sandbox/dist/components/icons/WedgeIcon.d.ts 490 B
./packages/react-sandbox/dist/components/Layout/index.d.ts 2.18 kB
./packages/react-sandbox/dist/components/LeftMenu/index.d.ts 438 B
./packages/react-sandbox/dist/components/MenuListItem/index.d.ts 1.91 kB
./packages/react-sandbox/dist/components/Pager/index.d.ts 557 B
./packages/react-sandbox/dist/components/SwitchCheckbox/index.d.ts 340 B
./packages/react-sandbox/dist/components/TextEllipsis/helper.d.ts 235 B
./packages/react-sandbox/dist/components/TextEllipsis/index.d.ts 381 B
./packages/react-sandbox/dist/components/WithIcon/index.d.ts 1.07 kB
./packages/react-sandbox/dist/foundation/constants.d.ts 208 B
./packages/react-sandbox/dist/foundation/hooks.d.ts 1.04 kB
./packages/react-sandbox/dist/foundation/support.d.ts 131 B
./packages/react-sandbox/dist/foundation/utils.d.ts 613 B
./packages/react-sandbox/dist/hooks/index.d.ts 148 B
./packages/react-sandbox/dist/index.cjs.js 63.4 kB
./packages/react-sandbox/dist/index.d.ts 1.38 kB
./packages/react-sandbox/dist/index.esm.js 53.6 kB
./packages/react-sandbox/dist/misc/storybook-helper.d.ts 343 B
./packages/react-sandbox/dist/styled.d.ts 12.3 kB
./packages/react/dist/_lib/compat.d.ts 1.19 kB
./packages/react/dist/_lib/createDivComponent.d.ts 455 B
./packages/react/dist/_lib/index.d.ts 1.02 kB
./packages/react/dist/_lib/useClassNames.d.ts 192 B
./packages/react/dist/_lib/useForwardedRef.d.ts 169 B
./packages/react/dist/components/Button/index.d.ts 1.14 kB
./packages/react/dist/components/Button/styledButtonTypeTest.d.d.ts 63 B
./packages/react/dist/components/Checkbox/CheckboxInput/index.d.ts 628 B
./packages/react/dist/components/Checkbox/CheckboxWithLabel.d.ts 307 B
./packages/react/dist/components/Checkbox/index.d.ts 668 B
./packages/react/dist/components/Clickable/index.d.ts 711 B
./packages/react/dist/components/DropdownSelector/Divider/index.d.ts 133 B
./packages/react/dist/components/DropdownSelector/DropdownMenuItem/index.d.ts 341 B
./packages/react/dist/components/DropdownSelector/DropdownPopover.d.ts 514 B
./packages/react/dist/components/DropdownSelector/index.d.ts 731 B
./packages/react/dist/components/DropdownSelector/ListItem/index.d.ts 535 B
./packages/react/dist/components/DropdownSelector/MenuItem/index.d.ts 639 B
./packages/react/dist/components/DropdownSelector/MenuItem/internals/handleFocusByKeyBoard.d.ts 373 B
./packages/react/dist/components/DropdownSelector/MenuItem/internals/useMenuItemHandleKeyDown.d.ts 480 B
./packages/react/dist/components/DropdownSelector/MenuItemGroup/index.d.ts 442 B
./packages/react/dist/components/DropdownSelector/MenuList/index.d.ts 568 B
./packages/react/dist/components/DropdownSelector/MenuList/internals/getValuesRecursive.d.ts 412 B
./packages/react/dist/components/DropdownSelector/MenuList/MenuListContext.d.ts 405 B
./packages/react/dist/components/DropdownSelector/Popover/index.d.ts 658 B
./packages/react/dist/components/DropdownSelector/Popover/usePreventScroll.d.ts 140 B
./packages/react/dist/components/DropdownSelector/utils/findPreviewRecursive.d.ts 411 B
./packages/react/dist/components/FieldLabel/index.d.ts 492 B
./packages/react/dist/components/Icon/index.d.ts 498 B
./packages/react/dist/components/IconButton/index.d.ts 665 B
./packages/react/dist/components/LoadingSpinner/index.d.ts 678 B
./packages/react/dist/components/Modal/Dialog/index.d.ts 373 B
./packages/react/dist/components/Modal/index.d.ts 2.15 kB
./packages/react/dist/components/Modal/ModalBackgroundContext.d.ts 231 B
./packages/react/dist/components/Modal/ModalPlumbing.d.ts 1.27 kB
./packages/react/dist/components/Modal/useCustomModalOverlay.d.ts 689 B
./packages/react/dist/components/Radio/index.d.ts 494 B
./packages/react/dist/components/Radio/RadioGroup/index.d.ts 699 B
./packages/react/dist/components/Radio/RadioGroupContext.d.ts 339 B
./packages/react/dist/components/Radio/RadioInput/index.d.ts 584 B
./packages/react/dist/components/SegmentedControl/index.d.ts 758 B
./packages/react/dist/components/SegmentedControl/RadioGroupContext.d.ts 362 B
./packages/react/dist/components/Switch/index.d.ts 452 B
./packages/react/dist/components/Switch/SwitchInput/index.d.ts 482 B
./packages/react/dist/components/Switch/SwitchWithLabel.d.ts 308 B
./packages/react/dist/components/TagItem/index.d.ts 765 B
./packages/react/dist/components/TextArea/index.d.ts 1.25 kB
./packages/react/dist/components/TextField/AssistiveText/index.d.ts 433 B
./packages/react/dist/components/TextField/index.d.ts 1.38 kB
./packages/react/dist/components/TextField/useFocusWithClick.d.ts 242 B
./packages/react/dist/core/CharcoalProvider.d.ts 270 B
./packages/react/dist/core/OverlayProvider.d.ts 101 B
./packages/react/dist/core/SSRProvider.d.ts 323 B
./packages/styled/dist/addThemeUtils.story.d.ts 330 B
./packages/styled/dist/builders/border.d.ts 685 B
./packages/styled/dist/builders/borderRadius.d.ts 440 B
./packages/styled/dist/builders/colors.d.ts 1.3 kB
./packages/styled/dist/builders/elementEffect.d.ts 533 B
./packages/styled/dist/builders/o.d.ts 5.91 kB
./packages/styled/dist/builders/outline.d.ts 638 B
./packages/styled/dist/builders/size.d.ts 1.19 kB
./packages/styled/dist/builders/spacing.d.ts 1.17 kB
./packages/styled/dist/builders/transition.d.ts 287 B
./packages/styled/dist/builders/typography.d.ts 624 B
./packages/styled/dist/defineThemeVariables.test.d.ts 66 B
./packages/styled/dist/factories/lib.d.ts 3.96 kB
./packages/styled/dist/index.test.d.ts 204 B
./packages/styled/dist/internals/index.d.ts 1.6 kB
./packages/styled/dist/storyHelper.d.ts 386 B
./packages/styled/dist/styles/assertiveRingCss.d.ts 141 B
./packages/styled/dist/styles/disabledCss.d.ts 131 B
./packages/styled/dist/styles/focusVisibleFocusRingCss.d.ts 318 B
./packages/styled/dist/TokenInjector.d.ts 533 B
./packages/styled/dist/util.d.ts 4.24 kB
./packages/styled/dist/utils/addThemeUtils.d.ts 383 B
./packages/styled/dist/utils/CharcoalStyledTheme.d.ts 1.43 kB
./packages/styled/dist/utils/gap.d.ts 473 B
./packages/styled/dist/utils/helpers/pxIfNum.d.ts 99 B
./packages/styled/dist/utils/helpers/SpacingType.d.ts 137 B
./packages/styled/dist/utils/margin.d.ts 905 B
./packages/styled/dist/utils/padding.d.ts 935 B
./packages/styled/dist/utils/typographyCss.d.ts 306 B
./packages/tailwind-config/dist/_lib/compat.d.ts 423 B
./packages/tailwind-config/dist/_lib/TailwindBuild.d.ts 723 B
./packages/tailwind-config/dist/colors/plugin.d.ts 427 B
./packages/tailwind-config/dist/colors/plugin.test.d.ts 52 B
./packages/tailwind-config/dist/colors/pluginTokenV1.d.ts 1.48 kB
./packages/tailwind-config/dist/colors/toTailwindConfig.d.ts 380 B
./packages/tailwind-config/dist/colors/toTailwindConfig.test.d.ts 62 B
./packages/tailwind-config/dist/colors/utils.d.ts 347 B
./packages/tailwind-config/dist/docs/borderRadius/BorderRadius.d.ts 119 B
./packages/tailwind-config/dist/docs/borderRadius/index.d.ts 231 B
./packages/tailwind-config/dist/docs/colors/Colors.d.ts 107 B
./packages/tailwind-config/dist/docs/colors/index.d.ts 147 B
./packages/tailwind-config/dist/docs/colors/TextBgColor.d.ts 175 B
./packages/tailwind-config/dist/docs/colors/TextBgColor.story.d.ts 298 B
./packages/tailwind-config/dist/docs/colors/TextColors.d.ts 115 B
./packages/tailwind-config/dist/docs/gradient/Gradients.d.ts 113 B
./packages/tailwind-config/dist/docs/gradient/index.d.ts 433 B
./packages/tailwind-config/dist/docs/gradient/utils.d.ts 120 B
./packages/tailwind-config/dist/docs/index.d.ts 360 B
./packages/tailwind-config/dist/docs/screens/index.d.ts 107 B
./packages/tailwind-config/dist/docs/screens/Screens.d.ts 109 B
./packages/tailwind-config/dist/docs/spacing/index.d.ts 107 B
./packages/tailwind-config/dist/docs/spacing/Spacing.d.ts 109 B
./packages/tailwind-config/dist/docs/typography/HalfLeading.d.ts 117 B
./packages/tailwind-config/dist/docs/typography/index.d.ts 346 B
./packages/tailwind-config/dist/docs/typography/Sizes.d.ts 105 B
./packages/tailwind-config/dist/foundation.d.ts 360 B
./packages/tailwind-config/dist/gradient/plugin.d.ts 916 B
./packages/tailwind-config/dist/gradient/plugin.test.d.ts 52 B
./packages/tailwind-config/dist/index.cjs.js 16 kB
./packages/tailwind-config/dist/index.d.ts 593 B
./packages/tailwind-config/dist/index.esm.js 13.8 kB
./packages/tailwind-config/dist/index.test.d.ts 51 B
./packages/tailwind-config/dist/tokenV2.d.ts 161 B
./packages/tailwind-config/dist/tokenV2.test.d.ts 53 B
./packages/tailwind-config/dist/types.d.ts 855 B
./packages/tailwind-config/dist/typography/plugin.d.ts 246 B
./packages/tailwind-config/dist/util.d.ts 833 B
./packages/tailwind-diff/dist/commands/check.d.ts 296 B
./packages/tailwind-diff/dist/commands/check.js 4.37 kB
./packages/tailwind-diff/dist/commands/dump.d.ts 185 B
./packages/tailwind-diff/dist/commands/dump.js 1.33 kB
./packages/tailwind-diff/dist/defer.d.ts 164 B
./packages/tailwind-diff/dist/defer.js 792 B
./packages/tailwind-diff/dist/index.d.ts 46 B
./packages/tailwind-diff/dist/index.js 1.84 kB
./packages/tailwind-diff/dist/packageManager.d.ts 323 B
./packages/tailwind-diff/dist/packageManager.js 1.85 kB
./packages/tailwind-diff/dist/style.d.ts 436 B
./packages/tailwind-diff/dist/style.js 2.68 kB
./packages/tailwind-diff/dist/withPackages.d.ts 464 B
./packages/tailwind-diff/dist/withPackages.js 3.24 kB
./packages/theme/dist/abstract-theme.d.ts 1.19 kB
./packages/theme/dist/default.d.ts 163 B
./packages/theme/dist/index.cjs.js 5.49 kB
./packages/theme/dist/index.d.ts 121 B
./packages/theme/dist/index.esm.js 3.49 kB
./packages/theme/dist/theme.d.ts 2.87 kB
./packages/theme/dist/unstable-css/_variables_dark.css.d.ts 26 B
./packages/theme/dist/unstable-css/_variables_light.css.d.ts 26 B
./packages/theme/dist/unstable-token-object/helpers/changecase-keys.d.ts 554 B
./packages/theme/dist/unstable-token-object/helpers/changecase-keys.test-d.d.ts 63 B
./packages/theme/dist/unstable-token-object/helpers/changecase-keys.test.d.ts 61 B
./packages/theme/dist/unstable-token-object/helpers/is-empty-array.d.ts 119 B
./packages/theme/dist/unstable-token-object/helpers/nest-object.d.ts 397 B
./packages/theme/dist/unstable-token-object/helpers/nest-object.test.d.ts 57 B
./packages/theme/dist/unstable-token-object/index.cjs.js 5.01 kB
./packages/theme/dist/unstable-token-object/index.d.ts 2.15 kB
./packages/theme/dist/unstable-token-object/index.esm.js 3.38 kB
./packages/theme/dist/unstable-token-object/reference-token.d.ts 299 B
./packages/theme/dist/unstable-token-object/reference-token.test.d.ts 61 B
./packages/theme/dist/unstable-token-object/to-token-object.d.ts 828 B
./packages/theme/dist/unstable-token-object/token-object.bench.d.ts 59 B
./packages/theme/dist/unstable-token-object/token-object.test.d.ts 58 B
./packages/theme/dist/unstable-token-object/types.d.ts 614 B
./packages/token-cli/dist/index.js 7.2 kB
./packages/utils/dist/index.cjs.js 6.81 kB
./packages/utils/dist/index.d.ts 3.17 kB
./packages/utils/dist/index.esm.js 4.67 kB

compressed-size-action

@yue4u yue4u added the image snapshots update Pull requests that update image snapshots label Feb 19, 2025
yue4u
yue4u commented Feb 19, 2025
View reviewed changes
package.json
@@ -12,7 +12,7 @@
"storybook:experimental-vite": "USE_VITE=1 storybook dev -p 6006",
"storybook:build": "storybook build",
"storybook:build-vite": "USE_VITE=1 storybook build",
"build": "yarn workspaces foreach -vpt -j unlimited run build",
"build": "yarn workspaces foreach -vp --topological-dev -j unlimited run build",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

これによってtextfield--prefixのsnapshotにiconが表示さるように治った

yue4u
yue4u commented Feb 19, 2025
View reviewed changes
packages/icons/src/PixivIcon.test.tsx
expect(icon).toBeInstanceOf(PixivIcon)
expect(icon.constructor.name).toBe('PixivIcon')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ビルド後のコードと差分があるらしい
スクリーンショット 2025-02-19 17 59 34

@yue4u yue4u requested review from naporin0624 and mimokmt February 19, 2025 09:51
@yue4u yue4u mentioned this pull request Feb 21, 2025
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@naporin0624 naporin0624 naporin0624 approved these changes

@mimokmt mimokmt Awaiting requested review from mimokmt

Assignees
No one assigned
Labels
image snapshots update Pull requests that update image snapshots minor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yue4u @naporin0624