diff --git a/example/examples/README.md b/example/examples/README.md index d499e8f45..63f05431c 100644 --- a/example/examples/README.md +++ b/example/examples/README.md @@ -4,7 +4,7 @@ Components Examples # Root Directory npm run build -cd example/base/ios +cd example/examples/ios pod install && cd .. diff --git a/example/examples/ios/Podfile.lock b/example/examples/ios/Podfile.lock index 78d8ff2aa..cd999d4ac 100644 --- a/example/examples/ios/Podfile.lock +++ b/example/examples/ios/Podfile.lock @@ -2,14 +2,14 @@ PODS: - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.69.1) - - FBReactNativeSpec (0.69.1): + - FBLazyVector (0.69.7) + - FBReactNativeSpec (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.69.1) - - RCTTypeSafety (= 0.69.1) - - React-Core (= 0.69.1) - - React-jsi (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) + - RCTRequired (= 0.69.7) + - RCTTypeSafety (= 0.69.7) + - React-Core (= 0.69.7) + - React-jsi (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) - Flipper (0.125.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) @@ -86,276 +86,276 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.69.1) - - RCTTypeSafety (0.69.1): - - FBLazyVector (= 0.69.1) - - RCTRequired (= 0.69.1) - - React-Core (= 0.69.1) - - React (0.69.1): - - React-Core (= 0.69.1) - - React-Core/DevSupport (= 0.69.1) - - React-Core/RCTWebSocket (= 0.69.1) - - React-RCTActionSheet (= 0.69.1) - - React-RCTAnimation (= 0.69.1) - - React-RCTBlob (= 0.69.1) - - React-RCTImage (= 0.69.1) - - React-RCTLinking (= 0.69.1) - - React-RCTNetwork (= 0.69.1) - - React-RCTSettings (= 0.69.1) - - React-RCTText (= 0.69.1) - - React-RCTVibration (= 0.69.1) - - React-bridging (0.69.1): + - RCTRequired (0.69.7) + - RCTTypeSafety (0.69.7): + - FBLazyVector (= 0.69.7) + - RCTRequired (= 0.69.7) + - React-Core (= 0.69.7) + - React (0.69.7): + - React-Core (= 0.69.7) + - React-Core/DevSupport (= 0.69.7) + - React-Core/RCTWebSocket (= 0.69.7) + - React-RCTActionSheet (= 0.69.7) + - React-RCTAnimation (= 0.69.7) + - React-RCTBlob (= 0.69.7) + - React-RCTImage (= 0.69.7) + - React-RCTLinking (= 0.69.7) + - React-RCTNetwork (= 0.69.7) + - React-RCTSettings (= 0.69.7) + - React-RCTText (= 0.69.7) + - React-RCTVibration (= 0.69.7) + - React-bridging (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi (= 0.69.1) - - React-callinvoker (0.69.1) - - React-Codegen (0.69.1): - - FBReactNativeSpec (= 0.69.1) + - React-jsi (= 0.69.7) + - React-callinvoker (0.69.7) + - React-Codegen (0.69.7): + - FBReactNativeSpec (= 0.69.7) - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.69.1) - - RCTTypeSafety (= 0.69.1) - - React-Core (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-Core (0.69.1): + - RCTRequired (= 0.69.7) + - RCTTypeSafety (= 0.69.7) + - React-Core (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-Core (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.69.1) - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-Core/Default (= 0.69.7) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/CoreModulesHeaders (0.69.1): + - React-Core/CoreModulesHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/Default (0.69.1): + - React-Core/Default (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/DevSupport (0.69.1): + - React-Core/DevSupport (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.69.1) - - React-Core/RCTWebSocket (= 0.69.1) - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-jsinspector (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-Core/Default (= 0.69.7) + - React-Core/RCTWebSocket (= 0.69.7) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-jsinspector (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTActionSheetHeaders (0.69.1): + - React-Core/RCTActionSheetHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTAnimationHeaders (0.69.1): + - React-Core/RCTAnimationHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTBlobHeaders (0.69.1): + - React-Core/RCTBlobHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTImageHeaders (0.69.1): + - React-Core/RCTImageHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTLinkingHeaders (0.69.1): + - React-Core/RCTLinkingHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTNetworkHeaders (0.69.1): + - React-Core/RCTNetworkHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTSettingsHeaders (0.69.1): + - React-Core/RCTSettingsHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTTextHeaders (0.69.1): + - React-Core/RCTTextHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTVibrationHeaders (0.69.1): + - React-Core/RCTVibrationHeaders (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-Core/RCTWebSocket (0.69.1): + - React-Core/RCTWebSocket (0.69.7): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.69.1) - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsiexecutor (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-Core/Default (= 0.69.7) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsiexecutor (= 0.69.7) + - React-perflogger (= 0.69.7) - Yoga - - React-CoreModules (0.69.1): + - React-CoreModules (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.1) - - React-Codegen (= 0.69.1) - - React-Core/CoreModulesHeaders (= 0.69.1) - - React-jsi (= 0.69.1) - - React-RCTImage (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-cxxreact (0.69.1): + - RCTTypeSafety (= 0.69.7) + - React-Codegen (= 0.69.7) + - React-Core/CoreModulesHeaders (= 0.69.7) + - React-jsi (= 0.69.7) + - React-RCTImage (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-cxxreact (0.69.7): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.69.1) - - React-jsi (= 0.69.1) - - React-jsinspector (= 0.69.1) - - React-logger (= 0.69.1) - - React-perflogger (= 0.69.1) - - React-runtimeexecutor (= 0.69.1) - - React-jsi (0.69.1): + - React-callinvoker (= 0.69.7) + - React-jsi (= 0.69.7) + - React-jsinspector (= 0.69.7) + - React-logger (= 0.69.7) + - React-perflogger (= 0.69.7) + - React-runtimeexecutor (= 0.69.7) + - React-jsi (0.69.7): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.69.1) - - React-jsi/Default (0.69.1): + - React-jsi/Default (= 0.69.7) + - React-jsi/Default (0.69.7): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.69.1): + - React-jsiexecutor (0.69.7): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-perflogger (= 0.69.1) - - React-jsinspector (0.69.1) - - React-logger (0.69.1): + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-perflogger (= 0.69.7) + - React-jsinspector (0.69.7) + - React-logger (0.69.7): - glog - - react-native-safe-area-context (4.3.1): + - react-native-safe-area-context (4.3.4): - RCT-Folly - RCTRequired - RCTTypeSafety - - React + - React-Core - ReactCommon/turbomodule/core - - React-perflogger (0.69.1) - - React-RCTActionSheet (0.69.1): - - React-Core/RCTActionSheetHeaders (= 0.69.1) - - React-RCTAnimation (0.69.1): + - React-perflogger (0.69.7) + - React-RCTActionSheet (0.69.7): + - React-Core/RCTActionSheetHeaders (= 0.69.7) + - React-RCTAnimation (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.1) - - React-Codegen (= 0.69.1) - - React-Core/RCTAnimationHeaders (= 0.69.1) - - React-jsi (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-RCTBlob (0.69.1): + - RCTTypeSafety (= 0.69.7) + - React-Codegen (= 0.69.7) + - React-Core/RCTAnimationHeaders (= 0.69.7) + - React-jsi (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-RCTBlob (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.69.1) - - React-Core/RCTBlobHeaders (= 0.69.1) - - React-Core/RCTWebSocket (= 0.69.1) - - React-jsi (= 0.69.1) - - React-RCTNetwork (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-RCTImage (0.69.1): + - React-Codegen (= 0.69.7) + - React-Core/RCTBlobHeaders (= 0.69.7) + - React-Core/RCTWebSocket (= 0.69.7) + - React-jsi (= 0.69.7) + - React-RCTNetwork (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-RCTImage (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.1) - - React-Codegen (= 0.69.1) - - React-Core/RCTImageHeaders (= 0.69.1) - - React-jsi (= 0.69.1) - - React-RCTNetwork (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-RCTLinking (0.69.1): - - React-Codegen (= 0.69.1) - - React-Core/RCTLinkingHeaders (= 0.69.1) - - React-jsi (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-RCTNetwork (0.69.1): + - RCTTypeSafety (= 0.69.7) + - React-Codegen (= 0.69.7) + - React-Core/RCTImageHeaders (= 0.69.7) + - React-jsi (= 0.69.7) + - React-RCTNetwork (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-RCTLinking (0.69.7): + - React-Codegen (= 0.69.7) + - React-Core/RCTLinkingHeaders (= 0.69.7) + - React-jsi (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-RCTNetwork (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.1) - - React-Codegen (= 0.69.1) - - React-Core/RCTNetworkHeaders (= 0.69.1) - - React-jsi (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-RCTSettings (0.69.1): + - RCTTypeSafety (= 0.69.7) + - React-Codegen (= 0.69.7) + - React-Core/RCTNetworkHeaders (= 0.69.7) + - React-jsi (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-RCTSettings (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.69.1) - - React-Codegen (= 0.69.1) - - React-Core/RCTSettingsHeaders (= 0.69.1) - - React-jsi (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-RCTText (0.69.1): - - React-Core/RCTTextHeaders (= 0.69.1) - - React-RCTVibration (0.69.1): + - RCTTypeSafety (= 0.69.7) + - React-Codegen (= 0.69.7) + - React-Core/RCTSettingsHeaders (= 0.69.7) + - React-jsi (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-RCTText (0.69.7): + - React-Core/RCTTextHeaders (= 0.69.7) + - React-RCTVibration (0.69.7): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.69.1) - - React-Core/RCTVibrationHeaders (= 0.69.1) - - React-jsi (= 0.69.1) - - ReactCommon/turbomodule/core (= 0.69.1) - - React-runtimeexecutor (0.69.1): - - React-jsi (= 0.69.1) - - ReactCommon/turbomodule/core (0.69.1): + - React-Codegen (= 0.69.7) + - React-Core/RCTVibrationHeaders (= 0.69.7) + - React-jsi (= 0.69.7) + - ReactCommon/turbomodule/core (= 0.69.7) + - React-runtimeexecutor (0.69.7): + - React-jsi (= 0.69.7) + - ReactCommon/turbomodule/core (0.69.7): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-bridging (= 0.69.1) - - React-callinvoker (= 0.69.1) - - React-Core (= 0.69.1) - - React-cxxreact (= 0.69.1) - - React-jsi (= 0.69.1) - - React-logger (= 0.69.1) - - React-perflogger (= 0.69.1) + - React-bridging (= 0.69.7) + - React-callinvoker (= 0.69.7) + - React-Core (= 0.69.7) + - React-cxxreact (= 0.69.7) + - React-jsi (= 0.69.7) + - React-logger (= 0.69.7) + - React-perflogger (= 0.69.7) - RNCMaskedView (0.1.11): - React - RNGestureHandler (2.5.0): @@ -406,7 +406,6 @@ DEPENDENCIES: - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) - - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) @@ -531,8 +530,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 068141206af867f72854753423d0117c4bf53419 - FBReactNativeSpec: 546a637adc797fa436dd51d1c63c580f820de31c + FBLazyVector: 6b7f5692909b4300d50e7359cdefbcd09dd30faa + FBReactNativeSpec: affcf71d996f6b0c01f68883482588297b9d5e6e Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -547,40 +546,40 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a - RCTRequired: ae07282b2ec9c90d7eb98251603bc3f82403d239 - RCTTypeSafety: a04dc1339af2e1da759ccd093bf11c310dce1ef6 - React: dbd201f781b180eab148aa961683943c72f67dcf - React-bridging: 10a863fdc0fc6f9c9f8527640936b293cd288bdc - React-callinvoker: 6ad32eee2630dab9023de5df2a6a8cacbfc99a67 - React-Codegen: fe3423fa6f37d05e233ab0e85e34fe0b443a5654 - React-Core: 6177b1f2dd794fe202a5042d3678b2ddfcbfb7d4 - React-CoreModules: c74e6b155f9876b1947fc8a13f0cb437cc7f6dcd - React-cxxreact: a07b7d90c4c71dd38c7383c7344b34d0a1336aee - React-jsi: d762c410d10830b7579225c78f2fd881c29649ca - React-jsiexecutor: 758e70947c232828a66b5ddc42d02b4d010fa26e - React-jsinspector: 55605caf04e02f9b0e05842b786f1c12dde08f4b - React-logger: ca970551cb7eea2fd814d0d5f6fc1a471eb53b76 - react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de - React-perflogger: c9161ff0f1c769993cd11d2751e4331ff4ceb7cd - React-RCTActionSheet: 2d885b0bea76a5254ef852939273edd8de116180 - React-RCTAnimation: 353fa4fc3c19060068832dd32e555182ec07be45 - React-RCTBlob: 647da863bc7d4f169bb80463fbcdd59c4fc76e6a - React-RCTImage: e77ee8d85f21ad5f4704e3ef67656903f45f9e76 - React-RCTLinking: 3dad213f5ef5798b9491037aebe84e8ad684d4c4 - React-RCTNetwork: ebbb9581d8fdc91596a4ee5e9f9ae37d5f1e13b9 - React-RCTSettings: a5e7f3f1d1b38be8bf9baa89228c5af98244f9ee - React-RCTText: 209576913f7eccd84425ea3f3813772f1f66e1e4 - React-RCTVibration: e8b7dd6635cc95689b5db643b5a3848f1e05b30b - React-runtimeexecutor: 27f468c5576eaf05ffb7a907528e44c75a3fcbae - ReactCommon: e30ec17dfb1d4c4f3419eac254350d6abca6d5a2 + RCTRequired: 54bff6aa61efd9598ab59d2a823c382b4fe13d27 + RCTTypeSafety: 47632bfa768df7befde08e339a9847e6cff6ff78 + React: 72a676de573cc5ee0e375e5535238af9a4bd435c + React-bridging: 12b6677a30fbd46555a35aa6096331737a9af598 + React-callinvoker: bb574a923c2281d01be23ed3b5d405caa583f56d + React-Codegen: a5e05592b65963a4a453808d2233a04edb7ac8cd + React-Core: 138385d05068622b2b1873eee7dc5be9762f5383 + React-CoreModules: 3a9be624998677db102b19090b1c33c7564ead6d + React-cxxreact: eb24a767b0b811259947f3d538e7c999467e7131 + React-jsi: 9c1cc1173fc8a24b094e01c54d8e3b567fed7edc + React-jsiexecutor: a73bec0218ba959fc92f811b581ad6c2270c6b6f + React-jsinspector: 8134ee22182b8dd98dc0973db6266c398103ce6c + React-logger: 1e7ac909607ee65fd5c4d8bea8c6e644f66b8843 + react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9 + React-perflogger: 8e832d4e21fdfa613033c76d58d7e617341e804b + React-RCTActionSheet: 9ca778182a9523991bff6381045885b6e808bb73 + React-RCTAnimation: 9ced26ad20b96e532ac791a8ab92a7b1ce2266b8 + React-RCTBlob: 2ca3402386d6ab8e9a9a39117305c7601ba2a7f8 + React-RCTImage: 7be51899367082a49e7a7560247ab3961e4dd248 + React-RCTLinking: 262229106f181d8187a5a041fa0dffe6e9726347 + React-RCTNetwork: 428b6f17bf4684ede387422eb789ca89365e33d3 + React-RCTSettings: eaef83489b80045528f1fe1ea5daefaa586ed763 + React-RCTText: d197cff9d5d7f68bdb88468d94617bbf2aa6a48d + React-RCTVibration: 600a9f8b3537db360563d50fab3d040c262567d4 + React-runtimeexecutor: 65cd2782a57e1d59a68aa5d504edf94278578e41 + ReactCommon: 1e783348b9aa73ae68236271df972ba898560a95 RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 7ab6e3ee4ce47d7b789d1cb520163833e515f452 + Yoga: 0b84a956f7393ef1f37f3bb213c516184e4a689d YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 36745b97236db17730b2d687b78fe071003a4a52 -COCOAPODS: 1.11.2 +COCOAPODS: 1.10.2 diff --git a/packages/core/src/ActionBar/index.tsx b/packages/core/src/ActionBar/index.tsx index fa697a9e1..6407b50c5 100644 --- a/packages/core/src/ActionBar/index.tsx +++ b/packages/core/src/ActionBar/index.tsx @@ -21,15 +21,17 @@ import { useSetState } from 'ahooks'; import RnText from '../Typography/RnText'; import { last } from '../utils/utils'; +export interface ActionBarActionsProps { + label?: string; + onPress?: () => void; + fontStyle?: TextStyle; + render?: ReactNode; +} + export type ActionBarProps = { height?: number; backgroundColor?: string; - actions?: Array<{ - label?: string; - onPress?: () => void; - fontStyle?: TextStyle; - render?: ReactNode; - }>; + actions?: ActionBarActionsProps[]; keepAbsoulte?: boolean; style?: ViewStyle; scroll?: boolean; diff --git a/test-ci/src/__tests__/actionBar.tsx b/test-ci/src/__tests__/actionBar.tsx new file mode 100644 index 000000000..cdd766ac2 --- /dev/null +++ b/test-ci/src/__tests__/actionBar.tsx @@ -0,0 +1,37 @@ +/** + * @format + */ + +import 'react-native'; +import React from 'react'; +import ActionBar, { ActionBarActionsProps } from '../lib/ActionBar'; +// Note: test renderer must be required after react-native. +import renderer from 'react-test-renderer'; + +it('ActionBar', () => { + const actions: ActionBarActionsProps[] = [ + { + label: 'Delete', + fontStyle: { fontWeight: 'bold', color: '#fff' }, + }, + { + label: 'Replace', + fontStyle: { fontWeight: 'bold', color: '#fff' }, + }, + { + label: 'Edit', + fontStyle: { fontWeight: 'bold', color: '#fff' }, + }, + ]; + const component = renderer.create( + , + ); + + expect(component.root.props.scroll).toBeTruthy(); + expect(component.root.props.keepAbsoulte).toBeTruthy(); + expect(component.root.props.useSafeArea).toBeTruthy(); + expect(component.root.props.height).toBe(48); + expect(component.root.props.focusIndex).toBe(1); + expect(component.root.props.backgroundColor).toBe('red'); + expect(component.root.props.actions).toMatchObject(actions); +}); diff --git a/yarn.lock b/yarn.lock index ee4a0b806..33ecc4722 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15986,15 +15986,26 @@ react-is@^16.13.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: resolved "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +<<<<<<< HEAD +react-is@^17.0.0, react-is@^17.0.1: +======= react-is@^17.0.1: +>>>>>>> 043a23ea7e39e7db4fc346df32d082b31fcd7372 version "17.0.2" resolved "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +<<<<<<< HEAD +react-markdown@7.1.2: + version "7.1.2" + resolved "https://registry.npmmirror.com/react-markdown/-/react-markdown-7.1.2.tgz#c9fa9d1c87e24529f028e1cdf731e81ccdd8e547" + integrity sha512-ibMcc0EbfmbwApqJD8AUr0yls8BSrKzIbHaUsPidQljxToCqFh34nwtu3CXNEItcVJNzpjDHrhK8A+MAh2JW3A== +======= react-markdown@~8.0.0: version "8.0.4" resolved "https://registry.npmmirror.com/react-markdown/-/react-markdown-8.0.4.tgz#b5ff1f0f29ead71a7a6f98815eb1a70bcc2a036e" integrity sha512-2oxHa6oDxc1apg/Gnc1Goh06t3B617xeywqI/92wmDV9FELI6ayRkwge7w7DoEqM0gRpZGTNU6xQG+YpJISnVg== +>>>>>>> 043a23ea7e39e7db4fc346df32d082b31fcd7372 dependencies: "@types/hast" "^2.0.0" "@types/prop-types" "^15.0.0"