Skip to content

feat(View): support inset="center" for both-axis centering #652

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

Open
blvdmitry wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

feat(View): support inset="center" for both-axis centering #652

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
2 changes: 1 addition & 1 deletion .changeset/view-inset-center.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"reshaped": minor
---

View: Added insetInline and insetBlock props with support for the "center" keyword value for centering absolutely positioned elements
View: Added `insetInline` and `insetBlock` props, and a `"center"` keyword value for `inset`, `insetInline` and `insetBlock` to center absolutely positioned elements without manual CSS transforms. `inset="center"` centers on both axes, `insetInline`/`insetBlock` center on a single axis.
4 changes: 2 additions & 2 deletions packages/reshaped/src/components/View/View.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ export type Props<TagName extends keyof React.JSX.IntrinsicElements | void = voi
borderRadius?: G.Responsive<TStyles.Radius>;
/** Position style */
position?: G.Responsive<TStyles.Position>;
/** Inset style, base unit token number multiplier when used as a number */
inset?: G.Responsive<TStyles.Inset>;
/** Inset style, base unit token number multiplier when used as a number, "center" centers the element on both axes */
inset?: G.Responsive<TStyles.InsetAxis>;
/** Inset start, base unit token number multiplier when used as a number */
insetStart?: G.Responsive<TStyles.Inset>;
/** Inset end, base unit token number multiplier when used as a number */
Expand Down
12 changes: 12 additions & 0 deletions packages/reshaped/src/components/View/tests/View.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,18 @@ export const inset = {
</View>
</Example.Item>

<Example.Item title="inset: center">
<View backgroundColor="neutral-faded" width={25} height={25}>
<View
backgroundColor="neutral"
position="absolute"
inset="center"
height={10}
width={10}
/>
</View>
</Example.Item>

<Example.Item title="responsive, [s] insetBottom: 4 [m+] insetEnd: 4">
<View backgroundColor="neutral-faded" width={25} height={25}>
<View
Expand Down
86 changes: 81 additions & 5 deletions packages/reshaped/src/styles/resolvers/inset/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,102 @@

exports[`Styles/Inset > handles 0 value 1`] = `
{
"classNames": [
"_root_31d553",
[
"_--inline-unit_31d553",
],
[
"_--block-unit_31d553",
],
],
"variables": {
"--rs-inset-block-s": 0,
"--rs-inset-inline-s": 0,
},
}
`;

exports[`Styles/Inset > handles center value 1`] = `
{
"classNames": [
"_root_31d553",
[
"_--inline-center_31d553",
],
[
"_--block-center_31d553",
],
],
"variables": {
"--rs-inset-s": 0,
"--rs-inset-block-s": "center",
"--rs-inset-inline-s": "center",
},
}
`;

exports[`Styles/Inset > handles positive value 1`] = `
{
"classNames": [
"_root_31d553",
[
"_--inline-unit_31d553",
],
[
"_--block-unit_31d553",
],
],
"variables": {
"--rs-inset-s": 4,
"--rs-inset-block-s": 4,
"--rs-inset-inline-s": 4,
},
}
`;

exports[`Styles/Inset > handles responsive center value 1`] = `
{
"classNames": [
"_root_31d553",
[
"_--inline-center_31d553",
"_--inline-unit--m_31d553",
],
[
"_--block-center_31d553",
"_--block-unit--m_31d553",
],
],
"variables": {
"--rs-inset-block-m": 4,
"--rs-inset-block-s": "center",
"--rs-inset-inline-m": 4,
"--rs-inset-inline-s": "center",
},
}
`;

exports[`Styles/Inset > handles responsive value 1`] = `
{
"classNames": [
"_root_31d553",
[
"_--inline-unit_31d553",
"_--inline-unit--m_31d553",
"_--inline-unit--l_31d553",
],
[
"_--block-unit_31d553",
"_--block-unit--m_31d553",
"_--block-unit--l_31d553",
],
],
"variables": {
"--rs-inset-l": 2,
"--rs-inset-m": 0,
"--rs-inset-s": 4,
"--rs-inset-block-l": 2,
"--rs-inset-block-m": 0,
"--rs-inset-block-s": 4,
"--rs-inset-inline-l": 2,
"--rs-inset-inline-m": 0,
"--rs-inset-inline-s": 4,
},
}
`;
Expand Down
8 changes: 8 additions & 0 deletions packages/reshaped/src/styles/resolvers/inset/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ describe("Styles/Inset", () => {
test("handles responsive value", async () => {
expect(inset({ s: 4, m: 0, l: 2 })).toMatchSnapshot();
});

test("handles center value", () => {
expect(inset("center")).toMatchSnapshot();
});

test("handles responsive center value", async () => {
expect(inset({ s: "center", m: 4 })).toMatchSnapshot();
});
});

describe("Styles/Inset/Top", () => {
Expand Down
25 changes: 23 additions & 2 deletions packages/reshaped/src/styles/resolvers/inset/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,30 @@ import * as T from "@/styles/types";
import s from "./inset.module.css";
import "./inset.css";

const inset: T.StyleResolver<T.Inset> = (value) => {
const inset: T.StyleResolver<T.InsetAxis> = (value) => {
if (value === undefined) return {};
return { variables: responsiveVariables("--rs-inset", value) };
// Insetting all sides is sugar for insetting both axes, which also lets
// `inset="center"` reuse the per-axis centering classes for both directions
const inlineClassNames = responsiveClassNames(
s,
(value) => (value === "center" ? "--inline-center" : "--inline-unit"),
value,
{ excludeValueFromClassName: true }
);
const blockClassNames = responsiveClassNames(
s,
(value) => (value === "center" ? "--block-center" : "--block-unit"),
value,
{ excludeValueFromClassName: true }
);

return {
classNames: [s.root, inlineClassNames, blockClassNames],
variables: {
...responsiveVariables("--rs-inset-inline", value),
...responsiveVariables("--rs-inset-block", value),
},
};
};

export const insetTop: T.StyleResolver<T.Inset> = (value) => {
Expand Down
6 changes: 0 additions & 6 deletions packages/reshaped/src/styles/resolvers/inset/inset.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
@responsive [style*="--rs-inset-s:"] {
@variable --rs-inset 0;

inset: calc(var(--rs-inset) * var(--rs-unit-x1));
}

@responsive [style*="--rs-inset-end-"] {
@variable --rs-inset-end 0;

Expand Down
2 changes: 1 addition & 1 deletion packages/reshaped/src/styles/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export type Mixin = {

position?: G.Responsive<Position>;
zIndex?: ZIndex;
inset?: G.Responsive<Inset>;
inset?: G.Responsive<InsetAxis>;
insetTop?: G.Responsive<Inset>;
insetBottom?: G.Responsive<Inset>;
insetStart?: G.Responsive<Inset>;
Expand Down
Loading