From ab5dea0a6de37725d86f8568572e818a2f5a877e Mon Sep 17 00:00:00 2001 From: Dominic Go <18517029+dominicstop@users.noreply.github.com> Date: Wed, 3 May 2023 21:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=20=F0=9F=9B=A0=20Refactor:=20Types=20-=20Repla?= =?UTF-8?q?ce=20`TUI`=20Prefix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related: * `TODO:2023-05-03-20-17-56` - Refactor: Types - Typescript type names should match native type names that they are representing. Summary: Replace `TUI` prefix w/ `UI`. --- example/src/examples/Test01.tsx | 4 ++-- src/constants/Enums.ts | 12 +++++----- .../RNIModalView/RNIModalViewTypes.ts | 24 +++++++++---------- src/types/NativeTypes.ts | 8 +++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/example/src/examples/Test01.tsx b/example/src/examples/Test01.tsx index 9cc3622c..f8c2d400 100644 --- a/example/src/examples/Test01.tsx +++ b/example/src/examples/Test01.tsx @@ -11,7 +11,7 @@ import { CardBody, CardButton, CardTitle } from '../components/Card'; import { ModalView, - TUIModalPresentationStyle, + UIModalPresentationStyle, UIModalPresentationStyles, } from 'react-native-ios-modal'; @@ -19,7 +19,7 @@ import { ObjectPropertyDisplay } from '../components/ObjectPropertyDisplay'; const availablePresentationStyles = Object.keys( UIModalPresentationStyles -) as Array; +) as Array; const totalPresentationStylesCount = availablePresentationStyles.length ?? 0; diff --git a/src/constants/Enums.ts b/src/constants/Enums.ts index ddf441f9..d46306e2 100644 --- a/src/constants/Enums.ts +++ b/src/constants/Enums.ts @@ -1,12 +1,12 @@ -import type { TUIBlurEffectStyles } from 'src/types/NativeTypes'; +import type { UIBlurEffectStyle } from 'src/types/NativeTypes'; import type { - TUIModalPresentationStyle, - TUIModalTransitionStyle, + UIModalPresentationStyle, + UIModalTransitionStyle, } from 'src/types/NativeTypes'; export const UIBlurEffectStyles: { - [T in TUIBlurEffectStyles]: T; + [T in UIBlurEffectStyle]: T; } = { // Adaptable Styles systemUltraThinMaterial: 'systemUltraThinMaterial', @@ -39,7 +39,7 @@ export const UIBlurEffectStyles: { }; export const UIModalPresentationStyles: { - [T in TUIModalPresentationStyle]: T; + [T in UIModalPresentationStyle]: T; } = { automatic: 'automatic', fullScreen: 'fullScreen', @@ -59,7 +59,7 @@ export const UIModalPresentationStyles: { }; export const UIModalTransitionStyles: { - [T in TUIModalTransitionStyle]: T; + [T in UIModalTransitionStyle]: T; } = { coverVertical: 'coverVertical', crossDissolve: 'crossDissolve', diff --git a/src/native_components/RNIModalView/RNIModalViewTypes.ts b/src/native_components/RNIModalView/RNIModalViewTypes.ts index 8b27baf5..84525d44 100644 --- a/src/native_components/RNIModalView/RNIModalViewTypes.ts +++ b/src/native_components/RNIModalView/RNIModalViewTypes.ts @@ -1,10 +1,10 @@ import type { ViewProps } from 'react-native'; import type { - TUIModalPresentationStyle, - TUIModalTransitionStyle, - TUISheetPresentationControllerDetents, - TUIBlurEffectStyles, + UIModalPresentationStyle, + UIModalTransitionStyle, + UISheetPresentationControllerDetents, + UIBlurEffectStyle, } from 'src/types/NativeTypes'; import type { RNIModalCustomSheetDetent } from 'src/types/RNIModalTypes'; @@ -48,13 +48,13 @@ export type RNIModalViewBaseProps = { isModalBGBlurred?: boolean; isModalBGTransparent?: boolean; - modalBGBlurEffectStyle?: TUIBlurEffectStyles; + modalBGBlurEffectStyle?: UIBlurEffectStyle; // Props - Presentation/Transition // ------------------------------- - modalTransitionStyle?: TUIModalTransitionStyle; - modalPresentationStyle?: TUIModalPresentationStyle; + modalTransitionStyle?: UIModalTransitionStyle; + modalPresentationStyle?: UIModalPresentationStyle; hideNonVisibleModals?: boolean; presentViaMount?: boolean; @@ -66,7 +66,7 @@ export type RNIModalViewBaseProps = { // --------------------- modalSheetDetents?: Array< - TUISheetPresentationControllerDetents | RNIModalCustomSheetDetent + UISheetPresentationControllerDetents | RNIModalCustomSheetDetent >; sheetPrefersScrollingExpandsWhenScrolledToEdge?: boolean; @@ -78,12 +78,12 @@ export type RNIModalViewBaseProps = { sheetPreferredCornerRadius?: number; sheetLargestUndimmedDetentIdentifier?: UnionWithAutoComplete< - TUISheetPresentationControllerDetents, + UISheetPresentationControllerDetents, string >; sheetSelectedDetentIdentifier?: UnionWithAutoComplete< - TUISheetPresentationControllerDetents, + UISheetPresentationControllerDetents, string >; @@ -124,6 +124,6 @@ export type RNIModalViewBaseProps = { export type RNIModalViewProps = Partial & RNIModalViewBaseProps; export type RNIModalViewConstantMap = ViewManagerConstantMap<{ - availableBlurEffectStyles: TUIBlurEffectStyles[]; - availablePresentationStyles: TUIModalPresentationStyle[]; + availableBlurEffectStyles: UIBlurEffectStyle[]; + availablePresentationStyles: UIModalPresentationStyle[]; }>; diff --git a/src/types/NativeTypes.ts b/src/types/NativeTypes.ts index 3a81dad2..3cc99553 100644 --- a/src/types/NativeTypes.ts +++ b/src/types/NativeTypes.ts @@ -10,13 +10,13 @@ export type CGPoint = { y: number; }; -export type TUIModalTransitionStyle = +export type UIModalTransitionStyle = | 'coverVertical' | 'flipHorizontal' | 'crossDissolve' | 'partialCurl'; -export type TUIModalPresentationStyle = +export type UIModalPresentationStyle = | 'automatic' | 'none' | 'fullScreen' @@ -30,12 +30,12 @@ export type TUIModalPresentationStyle = | 'blurOverFullScreen'; /** Maps to `UISheetPresentationController.Detents` */ -export type TUISheetPresentationControllerDetents = +export type UISheetPresentationControllerDetents = | 'medium' | 'large'; /** Maps to `UIBlurEffect.Style` */ -export type TUIBlurEffectStyles = +export type UIBlurEffectStyle = | 'systemUltraThinMaterial' | 'systemThinMaterial' | 'systemMaterial'