From 921536e1fbddda54e518fb29e6904555c23452ae Mon Sep 17 00:00:00 2001 From: Eshaan Dabasiya <76681468+im3dabasia@users.noreply.github.com> Date: Thu, 2 Jan 2025 20:24:08 +0530 Subject: [PATCH 1/3] fix: Fix media query and reduced motion error (#68464) Co-authored-by: im3dabasia Co-authored-by: mirka <0mirka00@git.wordpress.org> --- packages/edit-site/src/components/layout/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/edit-site/src/components/layout/style.scss b/packages/edit-site/src/components/layout/style.scss index caf7dd78da4b34..8d44015d529671 100644 --- a/packages/edit-site/src/components/layout/style.scss +++ b/packages/edit-site/src/components/layout/style.scss @@ -118,7 +118,7 @@ // This ensure the radius work properly. overflow: hidden; - @media not (prefers-reduced-motion) { + @media (prefers-reduced-motion: no-preference) { transition: border-radius, box-shadow 0.4s; } From dbc1bb47a48214594cf35252776caae65c325e61 Mon Sep 17 00:00:00 2001 From: Jon Surrell Date: Thu, 2 Jan 2025 17:47:11 +0100 Subject: [PATCH 2/3] Fix irregular workspace version numbers (#68467) Some packages and dependencies were introduced that do not use the version scheme currently used by Gutenberg for workspace dependencies: `*`. All workspace dependencies in the project should use the same versioning scheme. --- Co-authored-by: sirreal Co-authored-by: swissspidy Co-authored-by: gziolo --- package-lock.json | 20 ++++++++++---------- packages/edit-site/package.json | 2 +- packages/upload-media/package.json | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20c4950b3d732b..12fb6cb87ed3b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51098,7 +51098,7 @@ "@wordpress/icons": "*", "@wordpress/keyboard-shortcuts": "*", "@wordpress/keycodes": "*", - "@wordpress/media-utils": "5.14.0", + "@wordpress/media-utils": "*", "@wordpress/notices": "*", "@wordpress/patterns": "*", "@wordpress/plugins": "*", @@ -52660,15 +52660,15 @@ "license": "GPL-2.0-or-later", "dependencies": { "@shopify/web-worker": "^6.4.0", - "@wordpress/api-fetch": "file:../api-fetch", - "@wordpress/blob": "file:../blob", - "@wordpress/compose": "file:../compose", - "@wordpress/data": "file:../data", - "@wordpress/element": "file:../element", - "@wordpress/i18n": "file:../i18n", - "@wordpress/preferences": "file:../preferences", - "@wordpress/private-apis": "file:../private-apis", - "@wordpress/url": "file:../url", + "@wordpress/api-fetch": "*", + "@wordpress/blob": "*", + "@wordpress/compose": "*", + "@wordpress/data": "*", + "@wordpress/element": "*", + "@wordpress/i18n": "*", + "@wordpress/preferences": "*", + "@wordpress/private-apis": "*", + "@wordpress/url": "*", "uuid": "^9.0.1" }, "engines": { diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json index 299f0a67da9b7a..10466285910a19 100644 --- a/packages/edit-site/package.json +++ b/packages/edit-site/package.json @@ -56,7 +56,7 @@ "@wordpress/icons": "*", "@wordpress/keyboard-shortcuts": "*", "@wordpress/keycodes": "*", - "@wordpress/media-utils": "5.14.0", + "@wordpress/media-utils": "*", "@wordpress/notices": "*", "@wordpress/patterns": "*", "@wordpress/plugins": "*", diff --git a/packages/upload-media/package.json b/packages/upload-media/package.json index 14ae4f77dc5cb9..407592699183c2 100644 --- a/packages/upload-media/package.json +++ b/packages/upload-media/package.json @@ -28,15 +28,15 @@ "types": "build-types", "dependencies": { "@shopify/web-worker": "^6.4.0", - "@wordpress/api-fetch": "file:../api-fetch", - "@wordpress/blob": "file:../blob", - "@wordpress/compose": "file:../compose", - "@wordpress/data": "file:../data", - "@wordpress/element": "file:../element", - "@wordpress/i18n": "file:../i18n", - "@wordpress/preferences": "file:../preferences", - "@wordpress/private-apis": "file:../private-apis", - "@wordpress/url": "file:../url", + "@wordpress/api-fetch": "*", + "@wordpress/blob": "*", + "@wordpress/compose": "*", + "@wordpress/data": "*", + "@wordpress/element": "*", + "@wordpress/i18n": "*", + "@wordpress/preferences": "*", + "@wordpress/private-apis": "*", + "@wordpress/url": "*", "uuid": "^9.0.1" }, "publishConfig": { From 979c44d044770af92cb563a7a99c49c731064e02 Mon Sep 17 00:00:00 2001 From: Lena Morita Date: Fri, 3 Jan 2025 02:52:32 +0900 Subject: [PATCH 3/3] Tabs: Remove unnecessary stories (#68463) Co-authored-by: mirka <0mirka00@git.wordpress.org> Co-authored-by: tyxla --- .../src/tabs/stories/index.story.tsx | 131 ------------------ 1 file changed, 131 deletions(-) diff --git a/packages/components/src/tabs/stories/index.story.tsx b/packages/components/src/tabs/stories/index.story.tsx index e434bb501d85c9..0502d6400a4f5c 100644 --- a/packages/components/src/tabs/stories/index.story.tsx +++ b/packages/components/src/tabs/stories/index.story.tsx @@ -15,7 +15,6 @@ import { useState } from '@wordpress/element'; */ import { Tabs } from '..'; import { Slot, Fill, Provider as SlotFillProvider } from '../../slot-fill'; -import DropdownMenu from '../../dropdown-menu'; import Button from '../../button'; import Tooltip from '../../tooltip'; import Icon from '../../icon'; @@ -367,133 +366,3 @@ const CloseButtonTemplate: StoryFn< typeof Tabs > = ( props ) => { ); }; export const InsertCustomElements = CloseButtonTemplate.bind( {} ); - -const ControlledModeTemplate: StoryFn< typeof Tabs > = ( props ) => { - const [ selectedTabId, setSelectedTabId ] = useState< - string | undefined | null - >( props.selectedTabId ); - - return ( - <> - { - setSelectedTabId( selectedId ); - props.onSelect?.( selectedId ); - } } - > - - Tab 1 - - Tab 2 - - Tab 3 - - -

Selected tab: Tab 1

-
- -

Selected tab: Tab 2

-
- -

Selected tab: Tab 3

-
-
-
-

Select a tab:

- setSelectedTabId( 'tab1' ), - title: 'Tab 1', - isActive: selectedTabId === 'tab1', - }, - { - onClick: () => setSelectedTabId( 'tab2' ), - title: 'Tab 2', - isActive: selectedTabId === 'tab2', - }, - { - onClick: () => setSelectedTabId( 'tab3' ), - title: 'Tab 3', - isActive: selectedTabId === 'tab3', - }, - ] } - label="Choose a tab. The power is yours." - /> -
- - ); -}; - -export const ControlledMode = ControlledModeTemplate.bind( {} ); -ControlledMode.args = { - selectedTabId: 'tab3', -}; - -const TabBecomesDisabledTemplate: StoryFn< typeof Tabs > = ( props ) => { - const [ disableTab2, setDisableTab2 ] = useState( false ); - - return ( - <> - - - - Tab 1 - - Tab 2 - - Tab 3 - - -

Selected tab: Tab 1

-
- -

Selected tab: Tab 2

-
- -

Selected tab: Tab 3

-
-
- - ); -}; -export const TabBecomesDisabled = TabBecomesDisabledTemplate.bind( {} ); - -const TabGetsRemovedTemplate: StoryFn< typeof Tabs > = ( props ) => { - const [ removeTab1, setRemoveTab1 ] = useState( false ); - - return ( - <> - - - - { ! removeTab1 && Tab 1 } - Tab 2 - Tab 3 - - -

Selected tab: Tab 1

-
- -

Selected tab: Tab 2

-
- -

Selected tab: Tab 3

-
-
- - ); -}; -export const TabGetsRemoved = TabGetsRemovedTemplate.bind( {} );