From 62f79e67bf9196620a0314c493c814140f729fe6 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Tue, 21 Jul 2026 16:04:18 +0530 Subject: [PATCH 01/10] Components: Migrate ZStack styles from Emotion to SCSS module Replace the Emotion styled ZStackView/ZStackChildView with plain div elements referencing classes from a new style.module.scss. The dynamic per-child offset and z-index are applied via an inline CSS custom property (--z-stack-offset) and inline zIndex, since they are runtime values. Co-Authored-By: Claude Opus 4.8 (1M context) --- packages/components/src/z-stack/component.tsx | 25 +++++++----- .../components/src/z-stack/style.module.scss | 20 ++++++++++ packages/components/src/z-stack/styles.ts | 38 ------------------- 3 files changed, 36 insertions(+), 47 deletions(-) create mode 100644 packages/components/src/z-stack/style.module.scss delete mode 100644 packages/components/src/z-stack/styles.ts diff --git a/packages/components/src/z-stack/component.tsx b/packages/components/src/z-stack/component.tsx index 411ef13c7085e3..2505e3bc111c5e 100644 --- a/packages/components/src/z-stack/component.tsx +++ b/packages/components/src/z-stack/component.tsx @@ -1,6 +1,7 @@ /** * External dependencies */ +import clsx from 'clsx'; import type { ForwardedRef } from 'react'; /** @@ -13,7 +14,7 @@ import { isValidElement } from '@wordpress/element'; */ import { getValidChildren } from '../utils/get-valid-children'; import { contextConnect, useContextSystem } from '../context'; -import { ZStackView, ZStackChildView } from './styles'; +import styles from './style.module.scss'; import type { ZStackProps } from './types'; import type { WordPressComponentProps } from '../context'; @@ -42,25 +43,31 @@ function UnconnectedZStack( const key = isValidElement( child ) ? child.key : index; return ( - { child } - + ); } ); return ( - { clonedChildren } - + ); } diff --git a/packages/components/src/z-stack/style.module.scss b/packages/components/src/z-stack/style.module.scss new file mode 100644 index 00000000000000..8b8c6236cc5b1e --- /dev/null +++ b/packages/components/src/z-stack/style.module.scss @@ -0,0 +1,20 @@ +.z-stack { + display: inline-grid; + grid-auto-flow: column; + position: relative; +} + +.child { + position: relative; + justify-self: start; + + &:not(:first-of-type) { + margin-inline-start: var(--z-stack-offset, 0); + } +} + +// When the ZStack is layered, all items overlap in the same grid cell. +.layered > .child { + grid-row-start: 1; + grid-column-start: 1; +} diff --git a/packages/components/src/z-stack/styles.ts b/packages/components/src/z-stack/styles.ts deleted file mode 100644 index 186f268e643663..00000000000000 --- a/packages/components/src/z-stack/styles.ts +++ /dev/null @@ -1,38 +0,0 @@ -/** - * External dependencies - */ -import { css } from '@emotion/react'; -import styled from '@emotion/styled'; - -export const ZStackChildView = styled.div< { - offsetAmount: number; - zIndex: number; -} >` - &:not( :first-of-type ) { - ${ ( { offsetAmount } ) => - css( { - marginInlineStart: offsetAmount, - } ) }; - } - - ${ ( { zIndex } ) => css( { zIndex } ) }; -`; - -export const ZStackView = styled.div< { - isLayered: boolean; -} >` - display: inline-grid; - grid-auto-flow: column; - position: relative; - - & > ${ ZStackChildView } { - position: relative; - justify-self: start; - - ${ ( { isLayered } ) => - isLayered - ? // When `isLayered` is true, all items overlap in the same grid cell - css( { gridRowStart: 1, gridColumnStart: 1 } ) - : undefined }; - } -`; From 6f50a4204f06de422dd7827ebcea95af451831fc Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Tue, 21 Jul 2026 16:05:04 +0530 Subject: [PATCH 02/10] Add changelog entry for ZStack SCSS migration Co-Authored-By: Claude Opus 4.8 (1M context) --- packages/components/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 7fcb0565458ebb..04543e53e4a8d9 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -23,6 +23,7 @@ ### Internal - `ConfirmDialog`: Migrate styles from Emotion to an SCSS Module ([#80394](https://github.com/WordPress/gutenberg/pull/80394)). +- `ZStack`: Migrate styles from Emotion to an SCSS Module ([#80514](https://github.com/WordPress/gutenberg/pull/80514)). - `InputControl`, `SelectControl`, `CustomSelectControl`, `ToggleGroupControl`, and `RangeControl`: Remove obsolete internal `__shouldNotWarnDeprecated36pxSize` prop ([#80323](https://github.com/WordPress/gutenberg/pull/80323)). - `InputControl`, `SelectControl`, `CustomSelectControl`: Remove obsolete `__unstable-large` from the public `size` type. The value continues to work at runtime, and is equivalent to the `default` size. ([#80081](https://github.com/WordPress/gutenberg/pull/80081)). - `ToggleGroupControl`: Migrate styles from Emotion to SCSS Modules and use WPDS tokens for migrated visual values ([#80381](https://github.com/WordPress/gutenberg/pull/80381)). From 3247e3297051f961ae12ec4e3457f1cb16d6483d Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Tue, 21 Jul 2026 18:06:47 +0530 Subject: [PATCH 03/10] Chore: Remove suppresion --- tools/eslint/suppressions.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/eslint/suppressions.json b/tools/eslint/suppressions.json index 39d8dc3d6e9461..e1850f8d0253a2 100644 --- a/tools/eslint/suppressions.json +++ b/tools/eslint/suppressions.json @@ -914,11 +914,6 @@ "count": 1 } }, - "packages/components/src/z-stack/styles.ts": { - "no-restricted-imports": { - "count": 2 - } - }, "packages/compose/src/hooks/use-dialog/index.ts": { "react-hooks/immutability": { "count": 1 From 427e2e8c2090e315833fa6c2773537d5cc726323 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Wed, 5 Aug 2026 18:18:38 +0530 Subject: [PATCH 04/10] fix: Work on feedbakcs --- packages/components/CHANGELOG.md | 1 + packages/components/src/z-stack/component.tsx | 5 +++-- .../components/src/z-stack/style.module.scss | 20 +++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index ac017bd063c2ac..353e77132d449a 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -19,6 +19,7 @@ - Components that compose Emotion style fragments with `cx()` should pass source-order-dependent fragments in a single `css()` call. Passing separate fragments can change override order after the following components stopped rendering styles through Emotion: - `ToggleGroupControl` ([#80381](https://github.com/WordPress/gutenberg/pull/80381)) + - `ZStack` ([#80514](https://github.com/WordPress/gutenberg/pull/80514)) ### Internal diff --git a/packages/components/src/z-stack/component.tsx b/packages/components/src/z-stack/component.tsx index 2505e3bc111c5e..851c64ef806968 100644 --- a/packages/components/src/z-stack/component.tsx +++ b/packages/components/src/z-stack/component.tsx @@ -14,6 +14,7 @@ import { isValidElement } from '@wordpress/element'; */ import { getValidChildren } from '../utils/get-valid-children'; import { contextConnect, useContextSystem } from '../context'; +import { PolymorphicElement } from '../utils/polymorphic-element'; import styles from './style.module.scss'; import type { ZStackProps } from './types'; import type { WordPressComponentProps } from '../context'; @@ -57,7 +58,7 @@ function UnconnectedZStack( } ); return ( -
{ clonedChildren } -
+ ); } diff --git a/packages/components/src/z-stack/style.module.scss b/packages/components/src/z-stack/style.module.scss index 8b8c6236cc5b1e..09b410c16d6a9c 100644 --- a/packages/components/src/z-stack/style.module.scss +++ b/packages/components/src/z-stack/style.module.scss @@ -2,19 +2,19 @@ display: inline-grid; grid-auto-flow: column; position: relative; -} -.child { - position: relative; - justify-self: start; + > .child { + position: relative; + justify-self: start; + } - &:not(:first-of-type) { - margin-inline-start: var(--z-stack-offset, 0); + // When the ZStack is layered, all items overlap in the same grid cell. + &.layered > .child { + grid-row-start: 1; + grid-column-start: 1; } } -// When the ZStack is layered, all items overlap in the same grid cell. -.layered > .child { - grid-row-start: 1; - grid-column-start: 1; +.child:not(:first-of-type) { + margin-inline-start: var(--z-stack-offset, 0); } From 1c7e37b4bccde4b283fc45434d1c69c4d012a7d4 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Wed, 5 Aug 2026 18:28:47 +0530 Subject: [PATCH 05/10] chore: Remove changelog --- packages/components/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 353e77132d449a..ac017bd063c2ac 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -19,7 +19,6 @@ - Components that compose Emotion style fragments with `cx()` should pass source-order-dependent fragments in a single `css()` call. Passing separate fragments can change override order after the following components stopped rendering styles through Emotion: - `ToggleGroupControl` ([#80381](https://github.com/WordPress/gutenberg/pull/80381)) - - `ZStack` ([#80514](https://github.com/WordPress/gutenberg/pull/80514)) ### Internal From f855831d767640bc01a9c4f6b9d6693df622ceef Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Wed, 5 Aug 2026 18:31:55 +0530 Subject: [PATCH 06/10] chore: Remove changelog --- packages/components/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index ac017bd063c2ac..7134ea3d3b451d 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -24,7 +24,6 @@ - `ConfirmDialog`: Migrate styles from Emotion to an SCSS Module ([#80394](https://github.com/WordPress/gutenberg/pull/80394)). - `SearchControl`: Migrate styles from Emotion to an SCSS Module ([#80474](https://github.com/WordPress/gutenberg/pull/80474)). -- `ZStack`: Migrate styles from Emotion to an SCSS Module ([#80514](https://github.com/WordPress/gutenberg/pull/80514)). - `InputControl`, `SelectControl`, `CustomSelectControl`, `ToggleGroupControl`, and `RangeControl`: Remove obsolete internal `__shouldNotWarnDeprecated36pxSize` prop ([#80323](https://github.com/WordPress/gutenberg/pull/80323)). - `InputControl`, `SelectControl`, `CustomSelectControl`: Remove obsolete `__unstable-large` from the public `size` type. The value continues to work at runtime, and is equivalent to the `default` size. ([#80081](https://github.com/WordPress/gutenberg/pull/80081)). - `ToggleGroupControl`: Migrate styles from Emotion to SCSS Modules and use WPDS tokens for migrated visual values ([#80381](https://github.com/WordPress/gutenberg/pull/80381)). From a92baf7b41b314a2ec7ac6aa3e21a70660654ad2 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Wed, 5 Aug 2026 18:33:47 +0530 Subject: [PATCH 07/10] docs: Add changelog entry --- packages/components/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 9ae15cb596843b..f81975426dc048 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -9,6 +9,7 @@ - `Disabled` ([#80643](https://github.com/WordPress/gutenberg/pull/80643)) - `ToolsPanel` ([#80445](https://github.com/WordPress/gutenberg/pull/80445)) - `ItemGroup` ([#80797](https://github.com/WordPress/gutenberg/pull/80797)) + - `ZStack` ([#80514](https://github.com/WordPress/gutenberg/pull/80514)) - Remove the private `Theme` component ([#80691](https://github.com/WordPress/gutenberg/pull/80691)). ### Deprecations From 7ea918edc23b8b68a87b354afa54d88b37086351 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Mon, 24 Aug 2026 15:48:23 +0530 Subject: [PATCH 08/10] fix: give layered child class to level specificty --- packages/components/src/z-stack/style.module.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/components/src/z-stack/style.module.scss b/packages/components/src/z-stack/style.module.scss index 09b410c16d6a9c..48061693436e74 100644 --- a/packages/components/src/z-stack/style.module.scss +++ b/packages/components/src/z-stack/style.module.scss @@ -7,12 +7,14 @@ position: relative; justify-self: start; } +} - // When the ZStack is layered, all items overlap in the same grid cell. - &.layered > .child { - grid-row-start: 1; - grid-column-start: 1; - } +// When the ZStack is layered, all items overlap in the same grid cell. +// Kept at the top level so that the selector retains the same specificity +// as `.z-stack > .child` above, matching the original Emotion styles. +.layered > .child { + grid-row-start: 1; + grid-column-start: 1; } .child:not(:first-of-type) { From 623785ac2997a7c828e3b113791e0c8a549ef68f Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Tue, 25 Aug 2026 13:00:55 +0530 Subject: [PATCH 09/10] fix: maintain z-index specifity as it were in emotion --- packages/components/src/z-stack/component.tsx | 2 +- packages/components/src/z-stack/style.module.scss | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/components/src/z-stack/component.tsx b/packages/components/src/z-stack/component.tsx index 2f4bf17d35ab0c..409191136b156a 100644 --- a/packages/components/src/z-stack/component.tsx +++ b/packages/components/src/z-stack/component.tsx @@ -37,7 +37,7 @@ function UnconnectedZStack( className={ styles.child } style={ { '--z-stack-offset': `${ offsetAmount }px`, - zIndex, + '--z-stack-z-index': zIndex, } } key={ key } > diff --git a/packages/components/src/z-stack/style.module.scss b/packages/components/src/z-stack/style.module.scss index 48061693436e74..7aac3a4c3af844 100644 --- a/packages/components/src/z-stack/style.module.scss +++ b/packages/components/src/z-stack/style.module.scss @@ -17,6 +17,10 @@ grid-column-start: 1; } -.child:not(:first-of-type) { - margin-inline-start: var(--z-stack-offset, 0); +.child { + z-index: var(--z-stack-z-index, auto); + + &:not(:first-of-type) { + margin-inline-start: var(--z-stack-offset, 0); + } } From 20169d595a5d8a91dc919a9c73223c66a322b385 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Tue, 25 Aug 2026 13:24:55 +0530 Subject: [PATCH 10/10] chore: add log --- packages/components/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 1d8ebd35885a38..b9aa096b9a29a9 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -13,6 +13,7 @@ - `BorderBoxControl`, `BorderControl` ([#80437](https://github.com/WordPress/gutenberg/pull/80437)) - `ProgressBar` ([#80512](https://github.com/WordPress/gutenberg/pull/80512)) - `TextareaControl` ([#81353](https://github.com/WordPress/gutenberg/pull/81353)) + - `ZStack` ([#80514](https://github.com/WordPress/gutenberg/pull/80514)) ### Enhancements