From 7b6abde2e53de790f0a5c440acb865539b1ed6b6 Mon Sep 17 00:00:00 2001 From: Matheus Henrique Date: Tue, 21 May 2024 14:30:56 -0300 Subject: [PATCH 1/2] feat(system): add types to overflow --- .../src/{overflow.js => overflow/index.ts} | 2 +- .../system/src/{ => overflow}/overflow.test.js | 2 +- packages/system/src/overflow/types.ts | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) rename packages/system/src/{overflow.js => overflow/index.ts} (90%) rename packages/system/src/{ => overflow}/overflow.test.js (96%) create mode 100644 packages/system/src/overflow/types.ts diff --git a/packages/system/src/overflow.js b/packages/system/src/overflow/index.ts similarity index 90% rename from packages/system/src/overflow.js rename to packages/system/src/overflow/index.ts index 194b80e6e2..555da2f1fe 100644 --- a/packages/system/src/overflow.js +++ b/packages/system/src/overflow/index.ts @@ -1,4 +1,4 @@ -import { compose, generator } from './theme'; +import { compose, generator } from '../theme'; const overflow = props => generator({ diff --git a/packages/system/src/overflow.test.js b/packages/system/src/overflow/overflow.test.js similarity index 96% rename from packages/system/src/overflow.test.js rename to packages/system/src/overflow/overflow.test.js index dc94f2211b..4e0b0abc62 100644 --- a/packages/system/src/overflow.test.js +++ b/packages/system/src/overflow/overflow.test.js @@ -1,5 +1,5 @@ import { css } from 'styled-components'; -import { overflow, overflowX, overflowY, overflows } from './overflow'; +import { overflow, overflowX, overflowY, overflows } from '.'; describe('overflow', () => { describe('overflows', () => { diff --git a/packages/system/src/overflow/types.ts b/packages/system/src/overflow/types.ts new file mode 100644 index 0000000000..9e965371ff --- /dev/null +++ b/packages/system/src/overflow/types.ts @@ -0,0 +1,18 @@ +type OverflowValues = string; + +type Overflow = { + overflow?: OverflowValues; + of?: OverflowValues; +}; + +type OverflowX = { + overflowX?: OverflowValues; + ox?: OverflowValues; +}; + +type OverflowY = { + overflowY?: OverflowValues; + oy?: OverflowValues; +}; + +export type Overflows = Overflow & OverflowX & OverflowY; From deeb2390683b866b4f8ec604d5fcfa80809fd4bf Mon Sep 17 00:00:00 2001 From: Matheus Henrique Date: Tue, 21 May 2024 14:54:53 -0300 Subject: [PATCH 2/2] refactor(system): adjust files structure --- packages/system/src/overflow/index.ts | 28 ++----------------- packages/system/src/overflow/overflow.test.js | 2 +- packages/system/src/overflow/overflow.ts | 26 +++++++++++++++++ 3 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 packages/system/src/overflow/overflow.ts diff --git a/packages/system/src/overflow/index.ts b/packages/system/src/overflow/index.ts index 555da2f1fe..196d185fb1 100644 --- a/packages/system/src/overflow/index.ts +++ b/packages/system/src/overflow/index.ts @@ -1,26 +1,2 @@ -import { compose, generator } from '../theme'; - -const overflow = props => - generator({ - props, - prop: ['overflow', 'of'], - cssProperty: 'overflow', - }); - -const overflowX = props => - generator({ - props, - prop: ['overflowX', 'ox'], - cssProperty: 'overflow-x', - }); - -const overflowY = props => - generator({ - props, - prop: ['overflowY', 'oy'], - cssProperty: 'overflow-y', - }); - -const overflows = compose(overflow, overflowX, overflowY); - -export { overflows, overflow, overflowX, overflowY }; +export * from './overflow'; +export type { Overflows } from './types'; diff --git a/packages/system/src/overflow/overflow.test.js b/packages/system/src/overflow/overflow.test.js index 4e0b0abc62..dc94f2211b 100644 --- a/packages/system/src/overflow/overflow.test.js +++ b/packages/system/src/overflow/overflow.test.js @@ -1,5 +1,5 @@ import { css } from 'styled-components'; -import { overflow, overflowX, overflowY, overflows } from '.'; +import { overflow, overflowX, overflowY, overflows } from './overflow'; describe('overflow', () => { describe('overflows', () => { diff --git a/packages/system/src/overflow/overflow.ts b/packages/system/src/overflow/overflow.ts new file mode 100644 index 0000000000..555da2f1fe --- /dev/null +++ b/packages/system/src/overflow/overflow.ts @@ -0,0 +1,26 @@ +import { compose, generator } from '../theme'; + +const overflow = props => + generator({ + props, + prop: ['overflow', 'of'], + cssProperty: 'overflow', + }); + +const overflowX = props => + generator({ + props, + prop: ['overflowX', 'ox'], + cssProperty: 'overflow-x', + }); + +const overflowY = props => + generator({ + props, + prop: ['overflowY', 'oy'], + cssProperty: 'overflow-y', + }); + +const overflows = compose(overflow, overflowX, overflowY); + +export { overflows, overflow, overflowX, overflowY };