Skip to content

Commit e1c2c33

Browse files
DSilDSil
committed
feat(Inline): remove deprecated spacing values
BREAKING CHANGE: deprecated spacing prop values were removed.
1 parent b436acb commit e1c2c33

File tree

3 files changed

+19
-95
lines changed

3 files changed

+19
-95
lines changed

‎packages/orbit-components/src/Inline/README.md

+15-23
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,18 @@ All this properties - objects have the some own properties and none is required.
5656

5757
### spacingToken
5858

59-
| spacingToken |
60-
| :------------------------------------------ |
61-
| `"none"` |
62-
| `"XXXSmall"` - **deprecated (use `"50"`)** |
63-
| `"XXSmall"` - **deprecated (use `"100"`)** |
64-
| `"XSmall"` - **deprecated (use `"200"`)** |
65-
| `"small"` - **deprecated (use `"300"`)** |
66-
| `"medium"` - **deprecated (use `"400"`)** |
67-
| `"large"` - **deprecated (use `"600"`)** |
68-
| `"XLarge"` - **deprecated (use `"800"`)** |
69-
| `"XXLarge"` - **deprecated (use `"1000"`)** |
70-
| `"50"` |
71-
| `"100"` |
72-
| `"150"` |
73-
| `"200"` |
74-
| `"300"` |
75-
| `"400"` |
76-
| `"500"` |
77-
| `"600"` |
78-
| `"800"` |
79-
| `"1000"` |
80-
| `"1200"` |
81-
| `"1600"` |
59+
| spacingToken |
60+
| :----------- |
61+
| `"none"` |
62+
| `"50"` |
63+
| `"100"` |
64+
| `"150"` |
65+
| `"200"` |
66+
| `"300"` |
67+
| `"400"` |
68+
| `"500"` |
69+
| `"600"` |
70+
| `"800"` |
71+
| `"1000"` |
72+
| `"1200"` |
73+
| `"1600"` |

‎packages/orbit-components/src/Inline/helpers.ts

+3-62
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { SPACINGS, DEPRECATED_SPACINGS } from "../utils/layout/consts";
1+
import { SPACINGS } from "../utils/layout/consts";
22
import type { MediaQuery } from "./types";
33
import { getJustifyClasses, getAlignItemsClasses } from "../common/tailwind";
44
import { QUERIES } from "../utils/mediaQuery";
55

66
const spacingClasses: {
7-
[K in QUERIES | SPACINGS | DEPRECATED_SPACINGS]: K extends QUERIES
8-
? Record<SPACINGS | DEPRECATED_SPACINGS, string>
9-
: string;
7+
[K in QUERIES | SPACINGS]: K extends QUERIES ? Record<SPACINGS, string> : string;
108
} = {
119
[SPACINGS.NONE]: "",
1210
[SPACINGS.FIFTY]: "gap-50",
@@ -21,15 +19,6 @@ const spacingClasses: {
2119
[SPACINGS.ONE_THOUSAND]: "gap-1000",
2220
[SPACINGS.ONE_THOUSAND_TWO_HUNDRED]: "gap-1200",
2321
[SPACINGS.ONE_THOUSAND_SIX_HUNDRED]: "gap-1600",
24-
[DEPRECATED_SPACINGS.XXXSMALL]: "gap-50", // deprecated
25-
[DEPRECATED_SPACINGS.XXSMALL]: "gap-100", // deprecated
26-
[DEPRECATED_SPACINGS.XSMALL]: "gap-200", // deprecated
27-
[DEPRECATED_SPACINGS.SMALL]: "gap-300", // deprecated
28-
[DEPRECATED_SPACINGS.MEDIUM]: "gap-400", // deprecated
29-
[DEPRECATED_SPACINGS.LARGE]: "gap-600", // deprecated
30-
[DEPRECATED_SPACINGS.XLARGE]: "gap-800", // deprecated
31-
[DEPRECATED_SPACINGS.XXLARGE]: "gap-1000", // deprecated
32-
[DEPRECATED_SPACINGS.XXXLARGE]: "gap-[52px]", // deprecated
3322
[QUERIES.LARGEDESKTOP]: {
3423
[SPACINGS.NONE]: "",
3524
[SPACINGS.FIFTY]: "ld:gap-50",
@@ -44,15 +33,6 @@ const spacingClasses: {
4433
[SPACINGS.ONE_THOUSAND]: "ld:gap-1000",
4534
[SPACINGS.ONE_THOUSAND_TWO_HUNDRED]: "ld:gap-1200",
4635
[SPACINGS.ONE_THOUSAND_SIX_HUNDRED]: "ld:gap-1600",
47-
[DEPRECATED_SPACINGS.XXXSMALL]: "ld:gap-50", // deprecated
48-
[DEPRECATED_SPACINGS.XXSMALL]: "ld:gap-100", // deprecated
49-
[DEPRECATED_SPACINGS.XSMALL]: "ld:gap-200", // deprecated
50-
[DEPRECATED_SPACINGS.SMALL]: "ld:gap-300", // deprecated
51-
[DEPRECATED_SPACINGS.MEDIUM]: "ld:gap-400", // deprecated
52-
[DEPRECATED_SPACINGS.LARGE]: "ld:gap-600", // deprecated
53-
[DEPRECATED_SPACINGS.XLARGE]: "ld:gap-800", // deprecated
54-
[DEPRECATED_SPACINGS.XXLARGE]: "ld:gap-1000", // deprecated
55-
[DEPRECATED_SPACINGS.XXXLARGE]: "ld:gap-[52px]", // deprecated
5636
},
5737
[QUERIES.DESKTOP]: {
5838
[SPACINGS.NONE]: "",
@@ -68,15 +48,6 @@ const spacingClasses: {
6848
[SPACINGS.ONE_THOUSAND]: "de:gap-1000",
6949
[SPACINGS.ONE_THOUSAND_TWO_HUNDRED]: "de:gap-1200",
7050
[SPACINGS.ONE_THOUSAND_SIX_HUNDRED]: "de:gap-1600",
71-
[DEPRECATED_SPACINGS.XXXSMALL]: "de:gap-50", // deprecated
72-
[DEPRECATED_SPACINGS.XXSMALL]: "de:gap-100", // deprecated
73-
[DEPRECATED_SPACINGS.XSMALL]: "de:gap-200", // deprecated
74-
[DEPRECATED_SPACINGS.SMALL]: "de:gap-300", // deprecated
75-
[DEPRECATED_SPACINGS.MEDIUM]: "de:gap-400", // deprecated
76-
[DEPRECATED_SPACINGS.LARGE]: "de:gap-600", // deprecated
77-
[DEPRECATED_SPACINGS.XLARGE]: "de:gap-800", // deprecated
78-
[DEPRECATED_SPACINGS.XXLARGE]: "de:gap-1000", // deprecated
79-
[DEPRECATED_SPACINGS.XXXLARGE]: "de:gap-[52px]", // deprecated
8051
},
8152
[QUERIES.TABLET]: {
8253
[SPACINGS.NONE]: "",
@@ -92,15 +63,6 @@ const spacingClasses: {
9263
[SPACINGS.ONE_THOUSAND]: "tb:-mt-1000 tb:-ms-1000 tb:*:mt-1000 tb:*:ms-1000",
9364
[SPACINGS.ONE_THOUSAND_TWO_HUNDRED]: "tb:-mt-1200 tb:-ms-1200 tb:*:mt-1200 tb:*:ms-1200",
9465
[SPACINGS.ONE_THOUSAND_SIX_HUNDRED]: "tb:-mt-1600 tb:-ms-1600 tb:*:mt-1600 tb:*:ms-1600",
95-
[DEPRECATED_SPACINGS.XXXSMALL]: "tb:-mt-50 tb:-ms-50 tb:*:mt-50 tb:*:ms-50", // deprecated
96-
[DEPRECATED_SPACINGS.XXSMALL]: "tb:-mt-100 tb:-ms-100 tb:*:mt-100 tb:*:ms-100", // deprecated
97-
[DEPRECATED_SPACINGS.XSMALL]: "tb:-mt-200 tb:-ms-200 tb:*:mt-200 tb:*:ms-200", // deprecated
98-
[DEPRECATED_SPACINGS.SMALL]: "tb:-mt-300 tb:-ms-300 tb:*:mt-300 tb:*:ms-300", // deprecated
99-
[DEPRECATED_SPACINGS.MEDIUM]: "tb:-mt-400 tb:-ms-400 tb:*:mt-400 tb:*:ms-400", // deprecated
100-
[DEPRECATED_SPACINGS.LARGE]: "tb:-mt-600 tb:-ms-600 tb:*:mt-600 tb:*:ms-600", // deprecated
101-
[DEPRECATED_SPACINGS.XLARGE]: "tb:-mt-800 tb:-ms-800 tb:*:mt-800 tb:*:ms-800", // deprecated
102-
[DEPRECATED_SPACINGS.XXLARGE]: "tb:-mt-1000 tb:-ms-1000 tb:*:mt-1000 tb:*:ms-1000", // deprecated
103-
[DEPRECATED_SPACINGS.XXXLARGE]: "tb:-mt-[52px] tb:-ms-[52px] tb:*:mt-[52px] tb:*:ms-[52px]", // deprecated
10466
},
10567
[QUERIES.LARGEMOBILE]: {
10668
[SPACINGS.NONE]: "",
@@ -116,15 +78,6 @@ const spacingClasses: {
11678
[SPACINGS.ONE_THOUSAND]: "lm:gap-1000",
11779
[SPACINGS.ONE_THOUSAND_TWO_HUNDRED]: "lm:gap-1200",
11880
[SPACINGS.ONE_THOUSAND_SIX_HUNDRED]: "lm:gap-1600",
119-
[DEPRECATED_SPACINGS.XXXSMALL]: "lm:gap-50", // deprecated
120-
[DEPRECATED_SPACINGS.XXSMALL]: "lm:gap-100", // deprecated
121-
[DEPRECATED_SPACINGS.XSMALL]: "lm:gap-200", // deprecated
122-
[DEPRECATED_SPACINGS.SMALL]: "lm:gap-300", // deprecated
123-
[DEPRECATED_SPACINGS.MEDIUM]: "lm:gap-400", // deprecated
124-
[DEPRECATED_SPACINGS.LARGE]: "lm:gap-600", // deprecated
125-
[DEPRECATED_SPACINGS.XLARGE]: "lm:gap-800", // deprecated
126-
[DEPRECATED_SPACINGS.XXLARGE]: "lm:gap-1000", // deprecated
127-
[DEPRECATED_SPACINGS.XXXLARGE]: "lm:gap-[52px]", // deprecated
12881
},
12982
[QUERIES.MEDIUMMOBILE]: {
13083
[SPACINGS.NONE]: "",
@@ -140,22 +93,10 @@ const spacingClasses: {
14093
[SPACINGS.ONE_THOUSAND]: "mm:gap-1000",
14194
[SPACINGS.ONE_THOUSAND_TWO_HUNDRED]: "mm:gap-1200",
14295
[SPACINGS.ONE_THOUSAND_SIX_HUNDRED]: "mm:gap-1600",
143-
[DEPRECATED_SPACINGS.XXXSMALL]: "mm:gap-50", // deprecated
144-
[DEPRECATED_SPACINGS.XXSMALL]: "mm:gap-100", // deprecated
145-
[DEPRECATED_SPACINGS.XSMALL]: "mm:gap-200", // deprecated
146-
[DEPRECATED_SPACINGS.SMALL]: "mm:gap-300", // deprecated
147-
[DEPRECATED_SPACINGS.MEDIUM]: "mm:gap-400", // deprecated
148-
[DEPRECATED_SPACINGS.LARGE]: "mm:gap-600", // deprecated
149-
[DEPRECATED_SPACINGS.XLARGE]: "mm:gap-800", // deprecated
150-
[DEPRECATED_SPACINGS.XXLARGE]: "mm:gap-1000", // deprecated
151-
[DEPRECATED_SPACINGS.XXXLARGE]: "mm:gap-[52px]", // deprecated
15296
},
15397
};
15498

155-
const getSpacingClasses = (
156-
spacing: `${SPACINGS | DEPRECATED_SPACINGS}`,
157-
viewport?: QUERIES,
158-
): string => {
99+
const getSpacingClasses = (spacing: `${SPACINGS}`, viewport?: QUERIES): string => {
159100
return viewport ? spacingClasses[viewport][spacing] : spacingClasses[spacing];
160101
};
161102

‎packages/orbit-components/src/Inline/types.d.ts

+1-10
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,7 @@ export type SpacingToken =
1818
| "800"
1919
| "1000"
2020
| "1200"
21-
| "1600"
22-
| "XXXSmall"
23-
| "XXSmall"
24-
| "XSmall"
25-
| "small"
26-
| "medium"
27-
| "large"
28-
| "XLarge"
29-
| "XXLarge"
30-
| "XXXLarge";
21+
| "1600";
3122

3223
export type Align = "start" | "end" | "center";
3324
export type Justify = "start" | "end" | "center" | "between" | "around";

0 commit comments

Comments
 (0)