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: deprecate transform logical plugin for vanilla values #2437

Merged
merged 1 commit into from
Jan 22, 2024
Merged

fix: deprecate transform logical plugin for vanilla values #2437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 26 additions & 27 deletions components/accordion/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ governing permissions and limitations under the License.
--spectrum-accordion-component-edge-to-text: var(
--spectrum-component-edge-to-text-75
);

/* Text header */
--spectrum-accordion-item-header-font: var(--spectrum-sans-font-family-stack);
--spectrum-accordion-item-header-font-weight: var(
Expand All @@ -55,13 +56,7 @@ governing permissions and limitations under the License.
);
--spectrum-accordion-item-header-font-size: var(--spectrum-font-size-300);
--spectrum-accordion-item-header-line-height: 1.25;
&:lang(ja),
&:lang(zh),
&:lang(ko) {
--spectrum-accordion-item-header-line-height: var(
--spectrum-cjk-line-height-100
);
}

/* Text body */
--spectrum-accordion-item-content-font: var(
--spectrum-sans-font-family-stack
Expand All @@ -76,13 +71,7 @@ governing permissions and limitations under the License.
--spectrum-accordion-item-content-line-height: var(
--spectrum-line-height-100
);
&:lang(ja),
&:lang(zh),
&:lang(ko) {
--spectrum-accordion-item-content-line-height: var(
--spectrum-cjk-line-height-100
);
}

/* Colors */
--spectrum-accordion-background-color-default: rgba(
var(--spectrum-gray-900-rgb),
Expand All @@ -100,6 +89,7 @@ governing permissions and limitations under the License.
var(--spectrum-gray-900-rgb),
var(--spectrum-background-opacity-key-focus)
);

/* Label */
--spectrum-accordion-item-header-color-default: var(
--spectrum-neutral-content-color-default
Expand All @@ -120,12 +110,15 @@ governing permissions and limitations under the License.
--spectrum-accordion-item-content-disabled-color: var(
--spectrum-disabled-content-color
);

/* Body */
--spectrum-accordion-item-content-color: var(--spectrum-body-color);

/* Focus indicator */
--spectrum-accordion-focus-indicator-color: var(
--spectrum-focus-indicator-color
);

/* Divider */
--spectrum-accordion-divider-color: var(--spectrum-gray-300);
--spectrum-accordion-min-block-size: max(
Expand All @@ -151,6 +144,22 @@ governing permissions and limitations under the License.
)
)
);

[dir="rtl"] &,
&:dir(rtl) {
--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
}

&:lang(ja),
&:lang(zh),
&:lang(ko) {
--spectrum-accordion-item-header-line-height: var(
--spectrum-cjk-line-height-100
);
--spectrum-accordion-item-content-line-height: var(
--spectrum-cjk-line-height-100
);
}
}

.spectrum-Accordion--compact {
Expand Down Expand Up @@ -621,19 +630,9 @@ governing permissions and limitations under the License.

.spectrum-Accordion-item {
&.is-open {
> .spectrum-Accordion-itemHeading
> .spectrum-Accordion-itemIconContainer
> .spectrum-Accordion-itemIndicator {
/* stylelint-disable declaration-property-value-no-unknown */
transform: logical rotate(90deg);
/* stylelint-enable declaration-property-value-no-unknown */
}

> .spectrum-Accordion-itemIconContainer
> .spectrum-Accordion-itemIndicator {
/* stylelint-disable declaration-property-value-no-unknown */
transform: logical rotate(90deg);
/* stylelint-enable declaration-property-value-no-unknown */
> .spectrum-Accordion-itemHeading > .spectrum-Accordion-itemIconContainer > .spectrum-Accordion-itemIndicator,
> .spectrum-Accordion-itemIconContainer > .spectrum-Accordion-itemIndicator {
transform: var(--spectrum-logical-rotation,) rotate(90deg);
}

> .spectrum-Accordion-itemContent {
Expand Down
7 changes: 6 additions & 1 deletion components/actionbutton/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ governing permissions and limitations under the License.
--spectrum-actionbutton-focus-indicator-color: var(--spectrum-focus-indicator-color);
--spectrum-actionbutton-focus-indicator-border-radius: calc(var(--spectrum-actionbutton-border-radius) + var(--spectrum-actionbutton-focus-indicator-gap));

[dir="rtl"] &,
&:dir(rtl) {
--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
}

&.is-selected {
--mod-actionbutton-background-color-default: var(--mod-actionbutton-background-color-default-selected, var(--spectrum-neutral-background-color-selected-default));
--mod-actionbutton-background-color-hover: var(--mod-actionbutton-background-color-hover-selected, var(--spectrum-neutral-background-color-selected-hover));
Expand Down Expand Up @@ -253,7 +258,7 @@ a.spectrum-ActionButton {

color: inherit;

transform: logical rotate(0deg); /* stylelint-disable-line declaration-property-value-no-unknown */
transform: var(--spectrum-logical-rotation);
}

/* special cases for focus-ring */
Expand Down
9 changes: 6 additions & 3 deletions components/assetlist/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ governing permissions and limitations under the License.
/* label */
--spectrum-assetlist-item-label-padding-inline-start: var(--spectrum-spacing-100);
--spectrum-assetlist-label-color: var(--spectrum-neutral-content-color-default);

[dir="rtl"] &,
&:dir(rtl) {
--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
}
}

.spectrum-AssetList {
Expand Down Expand Up @@ -152,8 +157,7 @@ governing permissions and limitations under the License.
.spectrum-AssetList-itemChildIndicator {
display: none;
transition: transform ease var(--mod-assetlist-child-indicator-animation, var(--spectrum-assetlist-child-indicator-animation));

transform: logical rotate(0deg);
transform: var(--spectrum-logical-rotation);
}

.spectrum-AssetList-itemLabel {
Expand Down Expand Up @@ -182,4 +186,3 @@ governing permissions and limitations under the License.
}
}
}

5 changes: 2 additions & 3 deletions components/breadcrumb/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,11 @@ governing permissions and limitations under the License.
margin-block: var(--mod-breadcrumbs-icon-spacing-block, var(--spectrum-breadcrumbs-icon-spacing-block));
margin-inline: var(--mod-breadcrumbs-separator-spacing-inline, var(--spectrum-breadcrumbs-separator-spacing-inline));

transform: logical scale(1) rotate(0deg); /* stylelint-disable-line declaration-property-value-no-unknown */

opacity: 1;
color: var(--highcontrast-breadcrumbs-separator-color, var(--mod-breadcrumbs-separator-color, var(--spectrum-breadcrumbs-separator-color)));

[dir="rtl"] & {
[dir="rtl"] &,
&:dir(rtl) {
transform: scaleX(-1);
}

Expand Down
9 changes: 6 additions & 3 deletions components/calendar/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,11 @@ governing permissions and limitations under the License.
--spectrum-calendar-day-text-color-key-focus: var(--spectrum-gray-900);

--spectrum-calendar-button-icon-color: var(--spectrum-gray-700);
--spectrum-calendar-button-icon-color-disabled: var(--spectrum-disabled-content-color);

[dir="rtl"] &,
&:dir(rtl) {
--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
}
}

.spectrum-Calendar {
Expand Down Expand Up @@ -86,7 +89,7 @@ governing permissions and limitations under the License.

.spectrum-Calendar-prevMonth,
.spectrum-Calendar-nextMonth {
transform: logical rotate(0deg); /* stylelint-disable-line declaration-property-value-no-unknown */
transform: var(--spectrum-logical-rotation);

&:not([disabled]) {
color: var(--highcontrast-calendar-button-icon-color, var(--mod-calendar-button-icon-color, var(--spectrum-calendar-button-icon-color)));
Expand Down Expand Up @@ -239,7 +242,7 @@ governing permissions and limitations under the License.

inline-size: calc(
var(--mod-calendar-day-width, var(--spectrum-calendar-day-width)) +
calc(var(--mod-calendar-day-padding, var(--spectrum-calendar-day-padding)) * 2)
calc(var(--mod-calendar-day-padding, var(--spectrum-calendar-day-padding)) * 2)
);

&.is-range-start,
Expand Down
6 changes: 1 addition & 5 deletions components/calendar/stories/calendar.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Import the component markup template
import { Template } from "./template";

import isChromatic from "chromatic/isChromatic";
import ActionButtonStories from "@spectrum-css/actionbutton/stories/actionbutton.stories.js";
import isChromatic from "chromatic/isChromatic";

const months = [...Array(12).keys()].map((key) =>
new Date(0, key).toLocaleString("en", { month: "long" })
Expand Down Expand Up @@ -113,10 +113,6 @@ Default.args = {
year: 2023,
};

export const DefaultRTL = Template.bind({});
DefaultRTL.args = {...Default.args};
DefaultRTL.parameters = {textDirection: "rtl"}

export const RangeSelection = Template.bind({});
RangeSelection.args = {
month: months[6],
Expand Down
11 changes: 8 additions & 3 deletions components/pagination/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@ governing permissions and limitations under the License.
--spectrum-pagination-page-button-inline-spacing: var(--spectrum-pagination-item-inline-spacing);
--spectrum-pagination-counter-color: var(--spectrum-neutral-subdued-content-color-default);
--spectrum-pagination-counter-font-size: var(--spectrum-font-size-100);
--spectrum-pagination-counter-line-height: var(-spectrum-line-height-100);
--spectrum-pagination-counter-line-height: var(--spectrum-line-height-100);

[dir="rtl"] &,
&:dir(rtl) {
--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
}
}

.spectrum-Pagination--explicit,
Expand Down Expand Up @@ -49,9 +54,9 @@ governing permissions and limitations under the License.

/* Correct the direction of the arrows when viewing right-to-left */
.spectrum-Pagination-prevButton .spectrum-Icon {
transform: logical rotate(180deg);
transform: var(--spectrum-logical-rotation,) rotate(180deg);
}

.spectrum-Pagination-nextButton .spectrum-Icon {
transform: logical rotate(0deg);
transform: var(--spectrum-logical-rotation);
}
10 changes: 7 additions & 3 deletions components/slider/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ governing permissions and limitations under the License.

/* TODO: placeholder value for sideLabel variant value width */
--spectrum-slider-value-inline-size: 18px;

[dir="rtl"] &,
&:dir(rtl) {
--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
}
}


Expand Down Expand Up @@ -286,8 +291,7 @@ governing permissions and limitations under the License.
block-size: 100%;

/* Flip the ramp automatically for RTL */
/* stylelint-disable-next-line declaration-property-value-no-unknown */
transform: logical rotate(0deg);
transform: var(--spectrum-logical-rotation);
}
}

Expand Down Expand Up @@ -623,7 +627,7 @@ governing permissions and limitations under the License.
.spectrum-Slider--range {
.spectrum-Slider-track {
&:not(:first-of-type):not(:last-of-type)::before {
background: var(--highcontrast-slider-track-fill-color, var(--mod-slider-track-fill-color, var(--spectrum-slider-track-fill-color)));
background: var(--highcontrast-slider-track-fill-icolor, var(--mod-slider-track-fill-color, var(--spectrum-slider-track-fill-color)));
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions components/splitbutton/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ governing permissions and limitations under the License.
--spectrum-splitbutton-border-radius-edge: var(
--spectrum-alias-border-radius-small
);

[dir="rtl"] &,
&:dir(rtl) {
--spectrum-logical-rotation: matrix(-1, 0, 0, 1, 0, 0);
}
}

.spectrum-SplitButton-trigger {
Expand Down Expand Up @@ -118,6 +123,15 @@ governing permissions and limitations under the License.
z-index: 1;
outline: none;
}

/* Correct the direction of the arrows when viewing right-to-left */
&.spectrum-Pagination-prevButton .spectrum-Icon {
transform: var(--spectrum-logical-rotation,) rotate(180deg);
}

&.spectrum-Pagination-nextButton .spectrum-Icon {
transform: var(--spectrum-logical-rotation);
}
}

.spectrum-SplitButton-action {
Expand Down
Loading
Loading