Skip to content

feat(thumbnail-opacity-checkboard): S2 migration #3394

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

Merged
merged 6 commits into from
Nov 19, 2024
Merged

feat(thumbnail-opacity-checkboard): S2 migration #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a11f87f
feat(thumbnail-opacity-checkboard): s2 migration
cdransf Nov 12, 2024
1e7042e
feat(thumbnail-opacity-checkboard): fix token rule
cdransf Nov 19, 2024
fe7f457
feat(thumbnail-opacity-checkboard): fix typo, update changeset, move …
cdransf Nov 19, 2024
6577d13
feat(thumbnail-opacity-checkboard): drop unnecessary styles
cdransf Nov 19, 2024
0b71b80
feat(thumbnail-opacity-checkboard): update token
cdransf Nov 19, 2024
cdeaa8f
feat(thumbnail-opacity-checkboard): update changeset
cdransf Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/twenty-tables-know.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@spectrum-css/opacitycheckerboard": major
"@spectrum-css/thumbnail": minor
---

# thumbnail-opacity-checkerboard S2 migration

Adds thumbnail specific `thumbnail-opacity-checkerboard-square-size` token aliased to `--spectrum-opacity-checkerboard-size`. This impacts the display of the `opacity-checkerboard` when used within the `thumbnail` component.

This also corrects an issue with a token name in the `thumbnail` component by renaming `--spectrum-thumbnail-border-color-opacity` to `--spectrum-thumbnail-border-opacity`.
49 changes: 9 additions & 40 deletions components/opacitycheckerboard/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,53 +8,22 @@ express or implied. See the License for the specific language governing
permissions and limitations under the License. */

.spectrum-OpacityCheckerboard {
--spectrum-opacity-checkerboard-dark: var(
--spectrum-opacity-checkerboard-square-dark
);
--spectrum-opacity-checkerboard-light: var(
--spectrum-opacity-checkerboard-square-light
);
--spectrum-opacity-checkerboard-size: var(
--spectrum-opacity-checkerboard-square-size-medium
);
--spectrum-opacity-checkerboard-dark: var(--spectrum-opacity-checkerboard-square-dark);
--spectrum-opacity-checkerboard-light: var(--spectrum-opacity-checkerboard-square-light);
--spectrum-opacity-checkerboard-size: var(--spectrum-opacity-checkerboard-square-size-medium);
--spectrum-opacity-checkerboard-position: left top;
}

.spectrum-OpacityCheckerboard--sizeS {
--spectrum-opacity-checkerboard-size: var(
--spectrum-opacity-checkerboard-square-size-small
);
--spectrum-opacity-checkerboard-size: var(--spectrum-opacity-checkerboard-square-size-small);
}

.spectrum-OpacityCheckerboard {
background: repeating-conic-gradient(
var(
--mod-opacity-checkerboard-light,
var(--spectrum-opacity-checkerboard-light)
)
0% 25%,
var(
--mod-opacity-checkerboard-dark,
var(--spectrum-opacity-checkerboard-dark)
)
0% 50%
)
var(
--mod-opacity-checkerboard-position,
var(--spectrum-opacity-checkerboard-position)
) /
calc(
var(
--mod-opacity-checkerboard-size,
var(--spectrum-opacity-checkerboard-size)
) * 2
)
calc(
var(
--mod-opacity-checkerboard-size,
var(--spectrum-opacity-checkerboard-size)
) * 2
);
background: repeating-conic-gradient(var(--mod-opacity-checkerboard-light, var(--spectrum-opacity-checkerboard-light)) 0% 25%, var(--mod-opacity-checkerboard-dark, var(--spectrum-opacity-checkerboard-dark)) 0% 50%) var(--mod-opacity-checkerboard-position, var(--spectrum-opacity-checkerboard-position)) / calc(var(--mod-opacity-checkerboard-size, var(--spectrum-opacity-checkerboard-size)) * 2) calc(var(--mod-opacity-checkerboard-size, var(--spectrum-opacity-checkerboard-size)) * 2);

.spectrum-Thumbnail & {
--spectrum-opacity-checkerboard-size: var(--spectrum-thumbnail-opacity-checkerboard-square-size);
}
Comment on lines +24 to +26
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this adjustment belongs within the Thumbnail component CSS instead of the Opacity Checkerboard CSS. SWC would likely have trouble converting this as well.

}

@media (forced-colors: active) {
Expand Down
2 changes: 1 addition & 1 deletion components/thumbnail/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ governing permissions and limitations under the License.
--spectrum-thumbnail-border-width: var(--spectrum-border-width-100);

/* @todo Refactor with --spectrum-thumbnail-border-color once gray rgb token is no longer necessary to workaround nested rgb color token value using rgba(). */
--spectrum-thumbnail-border-color-rgba: rgba(var(--spectrum-gray-800-rgb), var(--spectrum-thumbnail-border-color-opacity));
--spectrum-thumbnail-border-color-rgba: rgba(var(--spectrum-gray-800-rgb), var(--spectrum-thumbnail-border-opacity));
--spectrum-thumbnail-layer-border-width-inner: var(--spectrum-border-width-400);
--spectrum-thumbnail-layer-border-color-inner: var(--spectrum-white);
--spectrum-thumbnail-layer-border-width-outer: var(--spectrum-border-width-100);
Expand Down
3 changes: 0 additions & 3 deletions components/thumbnail/stories/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ export const Template = ({
${OpacityCheckerboard({
rootClass: backgroundColor ? `${rootClass}-image-wrapper` : undefined,
customClasses: isLayer ? [`${rootClass}-layer-inner`] : !backgroundColor ? [`${rootClass}-image-wrapper`] : [],
customStyles: {
"--spectrum-opacity-checkerboard-size": "var(--spectrum-thumbnail-opacity-checkerboard-square-size)"
},
content: image ? [image] : [],
})}
</div>
Expand Down
Loading