From 34b8ce228d76377040ef90b0d0c5f86dc7c5d7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Wed, 23 Aug 2023 20:13:04 +0100 Subject: [PATCH 1/2] Migrate visibility to TS --- src/styles/utilities/visibility/index.js | 1 - src/styles/utilities/visibility/index.native.js | 1 - src/styles/utilities/visibility/index.native.ts | 6 ++++++ src/styles/utilities/visibility/index.ts | 10 ++++++++++ src/styles/utilities/visibility/types.ts | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) delete mode 100644 src/styles/utilities/visibility/index.js delete mode 100644 src/styles/utilities/visibility/index.native.js create mode 100644 src/styles/utilities/visibility/index.native.ts create mode 100644 src/styles/utilities/visibility/index.ts create mode 100644 src/styles/utilities/visibility/types.ts diff --git a/src/styles/utilities/visibility/index.js b/src/styles/utilities/visibility/index.js deleted file mode 100644 index daa7b01103c8..000000000000 --- a/src/styles/utilities/visibility/index.js +++ /dev/null @@ -1 +0,0 @@ -export default (visibility) => ({visibility}); diff --git a/src/styles/utilities/visibility/index.native.js b/src/styles/utilities/visibility/index.native.js deleted file mode 100644 index 56bf55ff188d..000000000000 --- a/src/styles/utilities/visibility/index.native.js +++ /dev/null @@ -1 +0,0 @@ -export default () => ({}); diff --git a/src/styles/utilities/visibility/index.native.ts b/src/styles/utilities/visibility/index.native.ts new file mode 100644 index 000000000000..7cab700032a2 --- /dev/null +++ b/src/styles/utilities/visibility/index.native.ts @@ -0,0 +1,6 @@ +import VisibilityStyles from './types'; + +export default { + visible: {}, + hidden: {}, +} satisfies VisibilityStyles; diff --git a/src/styles/utilities/visibility/index.ts b/src/styles/utilities/visibility/index.ts new file mode 100644 index 000000000000..d0428272deda --- /dev/null +++ b/src/styles/utilities/visibility/index.ts @@ -0,0 +1,10 @@ +import VisibilityStyles from './types'; + +export default { + visible: { + visibility: 'visible', + }, + hidden: { + visibility: 'hidden', + }, +} satisfies VisibilityStyles; diff --git a/src/styles/utilities/visibility/types.ts b/src/styles/utilities/visibility/types.ts new file mode 100644 index 000000000000..4d46efe2d29e --- /dev/null +++ b/src/styles/utilities/visibility/types.ts @@ -0,0 +1,5 @@ +import {CSSProperties} from 'react'; + +type VisibilityStyles = Record<'visible' | 'hidden', CSSProperties>; + +export default VisibilityStyles; From 8a937a23ea709a56ef7236567a44939b9d32bb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Thu, 24 Aug 2023 11:49:56 +0100 Subject: [PATCH 2/2] Fix types --- src/styles/styles.js | 10 +++++----- src/styles/utilities/visibility/index.native.ts | 6 ++++-- src/styles/utilities/visibility/index.ts | 6 ++++-- src/styles/utilities/visibility/types.ts | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 8df481ddb70e..e7f2cac8dfd2 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -638,14 +638,14 @@ const styles = { }, visuallyHidden: { - ...visibility('hidden'), + ...visibility.hidden, overflow: 'hidden', width: 0, height: 0, }, visibilityHidden: { - ...visibility('hidden'), + ...visibility.hidden, }, loadingVBAAnimation: { @@ -3047,7 +3047,7 @@ const styles = { left: '50%', top: 0, zIndex: 100, - ...visibility('hidden'), + ...visibility.hidden, }, floatingMessageCounterWrapperAndroid: { @@ -3057,7 +3057,7 @@ const styles = { position: 'absolute', top: 0, zIndex: 100, - ...visibility('hidden'), + ...visibility.hidden, }, floatingMessageCounterSubWrapperAndroid: { @@ -3067,7 +3067,7 @@ const styles = { floatingMessageCounter: { left: '-50%', - ...visibility('visible'), + ...visibility.visible, }, floatingMessageCounterTransformation: (translateY) => ({ diff --git a/src/styles/utilities/visibility/index.native.ts b/src/styles/utilities/visibility/index.native.ts index 7cab700032a2..c74719d02184 100644 --- a/src/styles/utilities/visibility/index.native.ts +++ b/src/styles/utilities/visibility/index.native.ts @@ -1,6 +1,8 @@ import VisibilityStyles from './types'; -export default { +const visibility: VisibilityStyles = { visible: {}, hidden: {}, -} satisfies VisibilityStyles; +}; + +export default visibility; diff --git a/src/styles/utilities/visibility/index.ts b/src/styles/utilities/visibility/index.ts index d0428272deda..8e2d3451be43 100644 --- a/src/styles/utilities/visibility/index.ts +++ b/src/styles/utilities/visibility/index.ts @@ -1,10 +1,12 @@ import VisibilityStyles from './types'; -export default { +const visibility: VisibilityStyles = { visible: { visibility: 'visible', }, hidden: { visibility: 'hidden', }, -} satisfies VisibilityStyles; +}; + +export default visibility; diff --git a/src/styles/utilities/visibility/types.ts b/src/styles/utilities/visibility/types.ts index 4d46efe2d29e..9dab3d7c752e 100644 --- a/src/styles/utilities/visibility/types.ts +++ b/src/styles/utilities/visibility/types.ts @@ -1,5 +1,5 @@ import {CSSProperties} from 'react'; -type VisibilityStyles = Record<'visible' | 'hidden', CSSProperties>; +type VisibilityStyles = Record<'visible' | 'hidden', Partial>>; export default VisibilityStyles;