Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/view-inset-center.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"reshaped": minor
---

View: Added insetInline and insetBlock props with support for the "center" keyword value for centering absolutely positioned elements
4 changes: 4 additions & 0 deletions packages/reshaped/src/components/View/View.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ const View = <As extends keyof React.JSX.IntrinsicElements = "div">(props: T.Pro
insetBottom,
insetStart,
insetEnd,
insetInline,
insetBlock,
zIndex,

/**
Expand Down Expand Up @@ -127,6 +129,8 @@ const View = <As extends keyof React.JSX.IntrinsicElements = "div">(props: T.Pro
insetBottom,
insetStart,
insetEnd,
insetInline,
insetBlock,
bleed,
width,
height,
Expand Down
4 changes: 4 additions & 0 deletions packages/reshaped/src/components/View/View.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ export type Props<TagName extends keyof React.JSX.IntrinsicElements | void = voi
insetTop?: G.Responsive<TStyles.Inset>;
/** Inset bottom, base unit token number multiplier when used as a number */
insetBottom?: G.Responsive<TStyles.Inset>;
/** Inset inline, base unit token number multiplier when used as a number, "center" centers on the inline axis */
insetInline?: G.Responsive<TStyles.InsetAxis>;
/** Inset block, base unit token number multiplier when used as a number, "center" centers on the block axis */
insetBlock?: G.Responsive<TStyles.InsetAxis>;
/** z-index style, based on the z-index tokens when used as a string */
zIndex?: TStyles.ZIndex;
/** Shadow style, based on the shadow tokens */
Expand Down
73 changes: 73 additions & 0 deletions packages/reshaped/src/components/View/tests/View.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,67 @@ export const inset = {
</View>
</Example.Item>

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

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

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

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

<Example.Item title="insetInline: center, insetBlock: center">
<View backgroundColor="neutral-faded" width={25} height={25}>
<View
backgroundColor="neutral"
position="absolute"
insetInline="center"
insetBlock="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 All @@ -1017,6 +1078,18 @@ export const inset = {
/>
</View>
</Example.Item>

<Example.Item title="responsive, [s] insetInline: center [m+] insetInline: 4">
<View backgroundColor="neutral-faded" width={25} height={25}>
<View
backgroundColor="neutral"
position="absolute"
insetInline={{ s: "center", m: 4 }}
height={10}
width={10}
/>
</View>
</Example.Item>
</Example>
),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,72 @@ exports[`Styles/Inset > handles undefined value 1`] = `{}`;

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

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

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

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

exports[`Styles/Inset/Block > handles responsive value 1`] = `
{
"classNames": [
"_root_31d553",
[
"_--block-unit_31d553",
"_--block-unit--m_31d553",
"_--block-unit--l_31d553",
],
],
"variables": {
"--rs-inset-block-l": 2,
"--rs-inset-block-m": 0,
Expand Down Expand Up @@ -114,22 +164,72 @@ exports[`Styles/Inset/End > handles undefined value 1`] = `{}`;

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

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

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

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

exports[`Styles/Inset/Inline > handles responsive value 1`] = `
{
"classNames": [
"_root_31d553",
[
"_--inline-unit_31d553",
"_--inline-unit--m_31d553",
"_--inline-unit--l_31d553",
],
],
"variables": {
"--rs-inset-inline-l": 2,
"--rs-inset-inline-m": 0,
Expand Down
16 changes: 16 additions & 0 deletions packages/reshaped/src/styles/resolvers/inset/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,17 @@ describe("Styles/Inset/Inline", () => {
expect(insetInline()).toMatchSnapshot();
});

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

test("handles responsive value", async () => {
expect(insetInline({ s: 4, m: 0, l: 2 })).toMatchSnapshot();
});

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

describe("Styles/Inset/Block", () => {
Expand All @@ -130,7 +138,15 @@ describe("Styles/Inset/Block", () => {
expect(insetBlock()).toMatchSnapshot();
});

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

test("handles responsive value", async () => {
expect(insetBlock({ s: 4, m: 0, l: 2 })).toMatchSnapshot();
});

test("handles responsive center value", async () => {
expect(insetBlock({ s: "center", m: 4 })).toMatchSnapshot();
});
});
31 changes: 26 additions & 5 deletions packages/reshaped/src/styles/resolvers/inset/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { responsiveVariables } from "@/utilities/props";
import { responsiveClassNames, responsiveVariables } from "@/utilities/props";
import * as T from "@/styles/types";
import s from "./inset.module.css";
import "./inset.css";

const inset: T.StyleResolver<T.Inset> = (value) => {
Expand Down Expand Up @@ -27,14 +28,34 @@ export const insetEnd: T.StyleResolver<T.Inset> = (value) => {
return { variables: responsiveVariables("--rs-inset-end", value) };
};

export const insetInline: T.StyleResolver<T.Inset> = (value) => {
export const insetInline: T.StyleResolver<T.InsetAxis> = (value) => {
if (value === undefined) return {};
return { variables: responsiveVariables("--rs-inset-inline", value) };
const classNames = responsiveClassNames(
s,
(value) => (value === "center" ? "--inline-center" : "--inline-unit"),
value,
{ excludeValueFromClassName: true }
);

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

export const insetBlock: T.StyleResolver<T.Inset> = (value) => {
export const insetBlock: T.StyleResolver<T.InsetAxis> = (value) => {
if (value === undefined) return {};
return { variables: responsiveVariables("--rs-inset-block", value) };
const classNames = responsiveClassNames(
s,
(value) => (value === "center" ? "--block-center" : "--block-unit"),
value,
{ excludeValueFromClassName: true }
);

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

export default inset;
12 changes: 0 additions & 12 deletions packages/reshaped/src/styles/resolvers/inset/inset.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@
inset: calc(var(--rs-inset) * var(--rs-unit-x1));
}

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

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

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

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

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

Expand Down
Loading
Loading