react-native-ui-lib 8.3.4-snapshot.7795 → 8.3.4-snapshot.7802

package/ReactNativeUiLib.podspec

@@ -0,0 +1,22 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'lib/package.json')))
+
+Pod::Spec.new do |s|
+  s.name         = "ReactNativeUiLib"
+  s.version      = package['version']
+  s.summary      = "React Native UI Library"
+
+  s.authors      = "Wix.com"
+  s.homepage     = package['homepage']
+  s.license      = package['license']
+  s.platforms    = { :ios => "9.0", :tvos => "9.2" }
+
+  s.module_name  = 'ReactNativeUiLib'
+
+  s.source       = { :git => "https://github.com/wix/react-native-ui-lib.git", :tag => "#{s.version}" }
+  s.source_files  = "lib/ios/**/*.{h,m}"
+
+  s.dependency 'React'
+  s.frameworks = 'UIKit'
+end

package/lib/components/HighlighterOverlayView/index.d.ts

@@ -1,4 +1,4 @@
-import { type JSX } from 'react';
+import React from 'react';
 import { ViewStyle } from 'react-native';
 type HighlightFrameType = {
     x: number;
@@ -28,7 +28,7 @@ export type HighlighterOverlayViewProps = {
     testID?: string;
 };
 declare const HighlighterOverlayView: {
-    (props: HighlighterOverlayViewProps): JSX.Element;
+    (props: HighlighterOverlayViewProps): React.JSX.Element;
     displayName: string;
 };
 export default HighlighterOverlayView;

package/lib/components/HighlighterOverlayView/index.web.d.ts

@@ -1,4 +1,4 @@
-import { type JSX } from 'react';
+import React from 'react';
 import { ViewStyle } from 'react-native';
 type HighlightFrameType = {
     x: number;
@@ -28,7 +28,7 @@ export type HighlighterOverlayViewProps = {
     testID?: string;
 };
 declare const HighlighterOverlayView: {
-    (props: HighlighterOverlayViewProps): JSX.Element;
+    (props: HighlighterOverlayViewProps): React.JSX.Element;
     displayName: string;
 };
 export default HighlighterOverlayView;

package/lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardViewBase.d.ts

@@ -9,7 +9,7 @@ export type CustomKeyboardViewBaseProps = {
     component?: string;
     onItemSelected?: (component?: string, args?: any) => void;
     onRequestShowKeyboard?: (keyboardId: string) => void;
-    children?: React.ReactNode;
+    children?: React.ReactChild | React.ReactChild[];
 };
 export default class CustomKeyboardViewBase<T extends CustomKeyboardViewBaseProps> extends Component<T> {
     static defaultProps: {

package/lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/index.js

@@ -33,8 +33,6 @@ export default class KeyboardRegistry {
    */
   static registerKeyboard = (componentID, generator, params = {}) => {
     if (!_isFunction(generator)) {
-      // TODO: do we want to add a util for this?
-      // eslint-disable-next-line no-restricted-syntax
       console.error(`KeyboardRegistry.registerKeyboard: ${componentID} you must register a generator function`);
       return;
     }
@@ -52,9 +50,7 @@ export default class KeyboardRegistry {
    */
   static getKeyboard = componentID => {
     const res = KeyboardRegistry.registeredKeyboards[componentID];
-    if (!res?.generator) {
-      // TODO: do we want to add a util for this?
-      // eslint-disable-next-line no-restricted-syntax
+    if (!res || !res.generator) {
       console.error(`KeyboardRegistry.getKeyboard: ${componentID} used but not yet registered`);
       return undefined;
     }

package/lib/components/Keyboard/KeyboardAccessoryView/index.d.ts

@@ -6,7 +6,7 @@ export type KeyboardAccessoryViewProps = kbTrackingViewProps & {
     /**
      * Content to be rendered above the keyboard
      */
-    renderContent?: () => React.ReactElement<any>;
+    renderContent?: () => React.ReactElement;
     /**
      * iOS only.
      * The reference to the actual text input (or the keyboard may not reset when instructed to, etc.).
@@ -37,7 +37,7 @@ export type KeyboardAccessoryViewProps = kbTrackingViewProps & {
      * Callback that will be called once the keyboard has been closed
      */
     onKeyboardResigned?: () => void;
-    children?: React.ReactNode;
+    children?: React.ReactChild;
 };
 /**
  * @description: View that allows replacing the default keyboard with other components

package/lib/components/Keyboard/KeyboardAccessoryView/index.js

@@ -141,9 +141,7 @@ class KeyboardAccessoryView extends Component {
       scrollBehavior,
       ...others
     } = this.props;
-    return <KeyboardTrackingView {...others} scrollBehavior={scrollBehavior} ref={r => {
-      this.trackingViewRef = r;
-    }} style={styles.trackingToolbarContainer} onLayout={this.onContainerComponentHeightChanged}>
+    return <KeyboardTrackingView {...others} scrollBehavior={scrollBehavior} ref={r => this.trackingViewRef = r} style={styles.trackingToolbarContainer} onLayout={this.onContainerComponentHeightChanged}>
         <KeyboardHeightListener id={`${this.id}`} onDismiss={this.onDismiss} onKeyboardHeightChange={this.onKeyboardHeightChange} />
         <>{renderContent?.()}</>
         <CustomKeyboardView keyboardHeight={keyboardHeight} shouldFocus={shouldFocus} onKeyboardDismiss={this.onKeyboardDismiss} inputRef={kbInputRef} component={kbComponent} initialProps={this.processInitialProps()} onItemSelected={onItemSelected} onRequestShowKeyboard={onRequestShowKeyboard} useSafeArea={others.useSafeArea} />

package/lib/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.ios.js

@@ -18,9 +18,7 @@ class KeyboardTrackingView extends PureComponent {
     useSafeArea: false
   };
   render() {
-    return <KeyboardTrackingViewNativeComponent {...this.props} ref={r => {
-      this.ref = r;
-    }} />;
+    return <KeyboardTrackingViewNativeComponent {...this.props} ref={r => this.ref = r} />;
   }
   async getNativeProps() {
     if (this.ref && KeyboardTrackingViewTempManager && KeyboardTrackingViewTempManager.getNativeProps) {

package/lib/components/Keyboard/KeyboardTrackingView/index.d.ts

@@ -73,13 +73,9 @@ export type KeyboardTrackingViewProps = ViewProps & {
     usesBottomTabs?: boolean;
     ref?: any;
     style?: StyleProp<ViewStyle>;
-    children?: React.ReactNode;
+    children?: React.ReactChild | React.ReactChild[];
 };
-declare const defaultProps: KeyboardTrackingViewProps;
-declare const KeyboardTrackingView: React.ForwardRefExoticComponent<Omit<KeyboardTrackingViewProps, "ref"> & React.RefAttributes<unknown>>;
-type KeyboardTrackingViewType = typeof KeyboardTrackingView & {
+declare const _default: React.ForwardRefExoticComponent<Omit<KeyboardTrackingViewProps, "ref"> & React.RefAttributes<unknown>> & {
     scrollBehaviors: typeof SCROLL_BEHAVIORS;
-    defaultProps: typeof defaultProps;
 };
-declare const _default: KeyboardTrackingViewType;
 export default _default;

package/lib/components/Keyboard/KeyboardTrackingView/index.js

@@ -8,16 +8,15 @@ const SCROLL_BEHAVIORS = {
   SCROLL_TO_BOTTOM_INVERTED_ONLY: NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorScrollToBottomInvertedOnly,
   FIXED_OFFSET: NativeModules.KeyboardTrackingViewTempManager?.KeyboardTrackingScrollBehaviorFixedOffset
 };
-const defaultProps = {};
 const KeyboardTrackingView = forwardRef(({
   children,
   ...others
 }, ref) => {
   const KeyboardTrackingViewContainer = isAndroid ? KeyboardTrackingViewAndroid : KeyboardTrackingViewIOS;
-  return <KeyboardTrackingViewContainer {...defaultProps} {...others} ref={ref}>
+  return <KeyboardTrackingViewContainer {...others} ref={ref}>
       {children}
     </KeyboardTrackingViewContainer>;
 });
-KeyboardTrackingView.defaultProps = defaultProps;
-KeyboardTrackingView.scrollBehaviors = SCROLL_BEHAVIORS;
-export default KeyboardTrackingView;
+export default KeyboardTrackingView;
+// @ts-expect-error
+KeyboardTrackingView.scrollBehaviors = SCROLL_BEHAVIORS;

package/lib/components/Keyboard/index.d.ts

@@ -11,7 +11,6 @@ declare const _default: {
             SCROLL_TO_BOTTOM_INVERTED_ONLY: any;
             FIXED_OFFSET: any;
         };
-        defaultProps: KeyboardTrackingViewProps;
     };
     KeyboardAwareInsetsView: {
         (props: import("react-native/types").ViewProps & {
@@ -28,7 +27,7 @@ declare const _default: {
             usesBottomTabs?: boolean | undefined;
             ref?: any;
             style?: import("react-native/types").StyleProp<import("react-native/types").ViewStyle>;
-            children?: import("react").ReactNode;
+            children?: import("react").ReactChild | import("react").ReactChild[] | undefined;
         } & {
             offset?: number | undefined;
         }): import("react").JSX.Element;

package/lib/package.json

@@ -1,22 +1,23 @@
 {
-    "name": "uilib-native",
-    "version": "5.1.0",
-    "homepage": "https://github.com/wix/react-native-ui-lib",
-    "description": "uilib native components (separated from js components)",
-    "main": "components/index",
-    "scripts": {
-        "releaseNative": ""
-    },
-    "author": "Ethan Sharabi <ethan.shar@gmail.com>",
-    "license": "MIT",
-    "dependencies": {
-        "lodash": "^4.17.21"
-    },
-    "devDependencies": {
-        "shell-utils": "^1.0.10"
-    },
-    "peerDependencies": {
-        "react": ">=19.0.0",
-        "react-native": ">=0.78.3"
-    }
+  "name": "uilib-native",
+  "version": "5.0.1",
+  "homepage": "https://github.com/wix/react-native-ui-lib",
+  "description": "uilib native components (separated from js components)",
+  "main": "components/index",
+  "scripts": {
+    "releaseNative": "node ./scripts/releaseNative.js"
+  },
+  "author": "Ethan Sharabi <ethan.shar@gmail.com>",
+  "license": "MIT",
+  "dependencies": {
+    "lodash": "^4.17.21",
+    "prop-types": "^15.5.10"
+  },
+  "devDependencies": {
+    "shell-utils": "^1.0.10"
+  },
+  "peerDependencies": {
+    "react": ">=18.3.1",
+    "react-native": ">=0.77.3"
+  }
 }

package/lib/react-native.config.js

@@ -4,7 +4,7 @@ module.exports = {
       /* TODO: Once we upgrade to RN69 we should try using podspecPath again, for now I copied ReactNativeUiLib.podspec file to the root - it seems to work
       I copied it, because we need it for both the main uilib and the uilib-native package */
       // ios: {
-      //   podspecPath: './uilib-native/ReactNativeUiLib.podspec'
+      //   podspecPath: './lib/ReactNativeUiLib.podspec'
       // },
       android: {
         sourceDir: './android/',

package/package.json

@@ -1,163 +1,165 @@
 {
-    "name": "react-native-ui-lib",
-    "version": "8.3.4-snapshot.7795",
-    "main": "src/index.js",
-    "types": "src/index.d.ts",
-    "author": "Ethan Sharabi <ethan.shar@gmail.com>",
-    "homepage": "https://github.com/wix/react-native-ui-lib",
-    "license": "MIT",
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/wix/react-native-ui-lib"
-    },
-    "scripts": {
-        "start": "watchman watch-del-all && react-native start --client-logs",
-        "pod-install": "(cd ios && pod install)",
-        "ios": "react-native run-ios",
-        "android": "react-native run-android",
-        "iPad": "react-native run-ios --simulator='iPad Pro (9.7 inch)'",
-        "test": "jest",
-        "test:watch": "jest --watch",
-        "test:perf": "TEST_RUNNER_ARGS='--testMatch **/*.perf.js' reassure measure",
-        "xcode": "xed ios",
-        "build": "node scripts/build/build.js",
-        "build:local": "./scripts/build/createLocalPackage.sh",
-        "release": ""
-    },
-    "dependencies": {
-        "babel-plugin-transform-inline-environment-variables": "^0.0.2",
-        "color": "^3.1.0",
-        "commons-validator-js": "^1.0.237",
-        "date-fns": "^2.29.3",
-        "hoist-non-react-statics": "^3.0.0",
-        "lodash": "^4.17.21",
-        "memoize-one": "^5.0.5",
-        "react-freeze": "^1.0.0",
-        "react-native-redash": "^12.0.3",
-        "semver": "^5.5.0",
-        "tinycolor2": "^1.4.2",
-        "url-parse": "^1.2.0",
-        "wix-react-native-text-size": "1.0.9"
-    },
-    "devDependencies": {
-        "@babel/cli": "^7.16.8",
-        "@babel/core": "^7.25.2",
-        "@babel/plugin-transform-modules-commonjs": "^7.17.9",
-        "@babel/preset-env": "^7.25.3",
-        "@babel/preset-react": "^7.10.1",
-        "@babel/runtime": "^7.26.10",
-        "@formatjs/intl-datetimeformat": "^6.0.3",
-        "@formatjs/intl-getcanonicallocales": "^2.0.2",
-        "@formatjs/intl-locale": "^3.0.3",
-        "@formatjs/intl-numberformat": "^8.0.4",
-        "@formatjs/intl-pluralrules": "^5.0.3",
-        "@react-native-community/blur": "4.4.1",
-        "@react-native-community/cli": "15.0.1",
-        "@react-native-community/cli-platform-android": "15.0.1",
-        "@react-native-community/cli-platform-ios": "15.0.1",
-        "@react-native-community/datetimepicker": "8.2.0",
-        "@react-native-community/netinfo": "11.3.3",
-        "@react-native/babel-preset": "0.78.3",
-        "@react-native/metro-config": "0.78.3",
-        "@react-native/typescript-config": "0.78.3",
-        "@shopify/flash-list": "1.7.6",
-        "@testing-library/react-native": "^13.3.3",
-        "@types/hoist-non-react-statics": "^3.3.7",
-        "@types/jest": "^29.5.13",
-        "@types/lodash": "^4.0.0",
-        "@types/react": "19.0.0",
-        "@types/react-test-renderer": "19.0.0",
-        "@types/tinycolor2": "^1.4.2",
-        "@types/url-parse": "^1.4.3",
-        "@welldone-software/why-did-you-render": "^3.2.1",
-        "babel-plugin-lodash": "^3.3.4",
-        "babel-plugin-module-resolver": "^5.0.0",
-        "jest": "^29.6.3",
-        "light-date": "^1.2.0",
-        "moment": "^2.24.0",
-        "object-hash": "^3.0.0",
-        "postcss": "^8.4.21",
-        "postcss-js": "^4.0.0",
-        "prettier": "^3.2.5",
-        "react": "19.0.0",
-        "react-autobind": "^1.0.6",
-        "react-dom": "19.0.0",
-        "react-native": "0.78.3",
-        "react-native-fs": "^2.20.0",
-        "react-native-gesture-handler": "2.24.0",
-        "react-native-haptic-feedback": "^1.11.0",
-        "react-native-linear-gradient": "2.6.2",
-        "react-native-mmkv": "3.2.0",
-        "react-native-navigation": "8.4.3",
-        "react-native-reanimated": "3.19.4",
-        "react-native-safe-area-context": "5.6.2",
-        "react-native-shimmer-placeholder": "^2.0.6",
-        "react-native-svg": "15.11.2",
-        "react-native-svg-transformer": "1.5.0",
-        "react-test-renderer": "19.0.0",
-        "reassure": "^0.4.1",
-        "setimmediate": "^1.0.5",
-        "shell-utils": "^1.0.10",
-        "typescript": "5.0.4",
-        "uilib-native": "5.0.1-snapshot.7795"
-    },
-    "peerDependencies": {
-        "react": ">=19.0.0",
-        "react-native": ">=0.77.3",
-        "react-native-gesture-handler": ">=2.24.0",
-        "react-native-reanimated": ">=3.19.4",
-        "react-native-ui-lib": "*",
-        "uilib-native": "5.1.0-snapshot.7635"
-    },
-    "jest": {
-        "preset": "react-native",
-        "transformIgnorePatterns": [
-            "node_modules/(?!(@react-native|react-native|react-native-reanimated|react-native-redash|uilib-native)/)"
-        ],
-        "testPathIgnorePatterns": [
-            "/e2e/",
-            "/node_modules/",
-            "/typings/",
-            "/expoDemo/",
-            "/uilib-docs/"
-        ],
-        "setupFiles": [
-            "./jestSetup/jest-setup.js"
-        ],
-        "testMatch": [
-            "**/*.spec.(js|ts|tsx)"
-        ],
-        "fakeTimers": {
-            "legacyFakeTimers": true
-        }
-    },
-    "engines": {
-        "node": ">=18"
-    },
-    "files": [
-        "*.js",
-        "*.d.ts",
-        "!scripts",
-        "scripts/release/prReleaseNotesCommon.js",
-        "scripts/docs/buildDocsCommon.js",
-        "src",
-        "testkit",
-        "ReactNativeUILib.podspec",
-        "!babel.config.js",
-        "!src/**/*.ts",
-        "src/**/*.d.ts",
-        "!src/**/*.tsx",
-        "!src/**/__tests__",
-        "!**/.DS_Store",
-        "lib/components",
-        "lib/ios",
-        "lib/android",
-        "!lib/android/build",
-        "!lib/scripts",
-        "lib/package.json",
-        "lib/ReactNativeUILib.podspec"
-    ]
+  "name": "react-native-ui-lib",
+  "version": "8.3.4-snapshot.7802",
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
+  "author": "Ethan Sharabi <ethan.shar@gmail.com>",
+  "homepage": "https://github.com/wix/react-native-ui-lib",
+  "license": "MIT",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/wix/react-native-ui-lib"
+  },
+  "scripts": {
+    "start": "watchman watch-del-all && react-native start --client-logs",
+    "pod-install": "(cd ios && pod install)",
+    "ios": "react-native run-ios",
+    "android": "react-native run-android",
+    "iPad": "react-native run-ios --simulator='iPad Pro (9.7 inch)'",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:perf": "TEST_RUNNER_ARGS='--testMatch **/*.perf.js' reassure measure",
+    "xcode": "xed ios",
+    "build": "node scripts/build/build.js",
+    "build:local": "./scripts/build/createLocalPackage.sh",
+    "release": "node ./scripts/release/release.js"
+  },
+  "dependencies": {
+    "babel-plugin-transform-inline-environment-variables": "^0.0.2",
+    "color": "^3.1.0",
+    "commons-validator-js": "^1.0.237",
+    "date-fns": "^2.29.3",
+    "deprecated-react-native-prop-types": "^2.3.0",
+    "hoist-non-react-statics": "^3.0.0",
+    "lodash": "^4.17.21",
+    "memoize-one": "^5.0.5",
+    "prop-types": "^15.5.10",
+    "react-freeze": "^1.0.0",
+    "react-native-redash": "^12.0.3",
+    "semver": "^5.5.0",
+    "tinycolor2": "^1.4.2",
+    "url-parse": "^1.2.0",
+    "wix-react-native-text-size": "1.0.9"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.16.8",
+    "@babel/core": "^7.25.2",
+    "@babel/plugin-transform-modules-commonjs": "^7.17.9",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/preset-react": "^7.10.1",
+    "@babel/runtime": "^7.26.10",
+    "@formatjs/intl-datetimeformat": "^6.0.3",
+    "@formatjs/intl-getcanonicallocales": "^2.0.2",
+    "@formatjs/intl-locale": "^3.0.3",
+    "@formatjs/intl-numberformat": "^8.0.4",
+    "@formatjs/intl-pluralrules": "^5.0.3",
+    "@react-native-community/blur": "4.4.1",
+    "@react-native-community/cli": "15.0.1",
+    "@react-native-community/cli-platform-android": "15.0.1",
+    "@react-native-community/cli-platform-ios": "15.0.1",
+    "@react-native-community/datetimepicker": "8.2.0",
+    "@react-native-community/netinfo": "11.3.3",
+    "@react-native/babel-preset": "0.77.3",
+    "@react-native/metro-config": "0.77.3",
+    "@react-native/typescript-config": "0.77.3",
+    "@shopify/flash-list": "1.7.6",
+    "@testing-library/react-native": "^11.5.1",
+    "@types/hoist-non-react-statics": "^3.3.1",
+    "@types/jest": "^29.5.13",
+    "@types/lodash": "^4.0.0",
+    "@types/prop-types": "^15.5.3",
+    "@types/react": "18.3.24",
+    "@types/react-test-renderer": "^18.3.0",
+    "@types/tinycolor2": "^1.4.2",
+    "@types/url-parse": "^1.4.3",
+    "@welldone-software/why-did-you-render": "^3.2.1",
+    "babel-plugin-lodash": "^3.3.4",
+    "babel-plugin-module-resolver": "^5.0.0",
+    "jest": "^29.6.3",
+    "light-date": "^1.2.0",
+    "moment": "^2.24.0",
+    "object-hash": "^3.0.0",
+    "postcss": "^8.4.21",
+    "postcss-js": "^4.0.0",
+    "prettier": "^3.2.5",
+    "react": "18.3.1",
+    "react-autobind": "^1.0.6",
+    "react-dom": "18.3.1",
+    "react-native": "0.77.3",
+    "react-native-fs": "^2.20.0",
+    "react-native-gesture-handler": "2.24.0",
+    "react-native-haptic-feedback": "^1.11.0",
+    "react-native-linear-gradient": "2.6.2",
+    "react-native-mmkv": "3.2.0",
+    "react-native-navigation": "8.1.2",
+    "react-native-reanimated": "3.18.0",
+    "react-native-safe-area-context": "5.6.2",
+    "react-native-shimmer-placeholder": "^2.0.6",
+    "react-native-svg": "15.11.2",
+    "react-native-svg-transformer": "1.5.0",
+    "react-test-renderer": "18.3.1",
+    "reassure": "^0.4.1",
+    "setimmediate": "^1.0.5",
+    "shell-utils": "^1.0.10",
+    "typescript": "5.0.4",
+    "uilib-native": "^5.0.1"
+  },
+  "peerDependencies": {
+    "react": ">=18.3.1",
+    "react-native": ">=0.77.3",
+    "react-native-gesture-handler": ">=2.24.0",
+    "react-native-reanimated": ">=3.17.5",
+    "uilib-native": "^5.0.1"
+  },
+  "jest": {
+    "preset": "react-native",
+    "transformIgnorePatterns": [
+      "node_modules/(?!(@react-native|react-native|react-native-reanimated|react-native-redash|uilib-native)/)"
+    ],
+    "testPathIgnorePatterns": [
+      "/e2e/",
+      "/node_modules/",
+      "/typings/",
+      "/expoDemo/",
+      "/uilib-docs/"
+    ],
+    "setupFiles": [
+      "./jestSetup/jest-setup.js"
+    ],
+    "testMatch": [
+      "**/*.spec.(js|ts|tsx)"
+    ],
+    "fakeTimers": {
+      "legacyFakeTimers": true
+    }
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "files": [
+    "*.js",
+    "*.d.ts",
+    "!scripts",
+    "scripts/release/prReleaseNotesCommon.js",
+    "scripts/docs/buildDocsCommon.js",
+    "src",
+    "testkit",
+    "ReactNativeUILib.podspec",
+    "!babel.config.js",
+    "!src/**/*.ts",
+    "src/**/*.d.ts",
+    "!src/**/*.tsx",
+    "!src/**/__tests__",
+    "!**/.DS_Store",
+    "lib/components",
+    "lib/ios",
+    "lib/android",
+    "!lib/android/build",
+    "!lib/scripts",
+    "lib/package.json",
+    "lib/ReactNativeUILib.podspec"
+  ]
 }

package/src/commons/asBaseComponent.js

@@ -32,7 +32,7 @@ function asBaseComponent(WrappedComponent, options = {}) {
       return Modifiers.getThemeProps.call(WrappedComponent, props, context);
     };
     static getDerivedStateFromError(error) {
-      UIComponent.defaultProps?.onError?.(error);
+      UIComponent.defaultProps?.onError?.(error, WrappedComponent.defaultProps);
       return {
         error: true
       };
@@ -55,7 +55,6 @@ function asBaseComponent(WrappedComponent, options = {}) {
   hoistStatics(BaseComponent, WrappedComponent);
   BaseComponent.displayName = WrappedComponent.displayName;
   BaseComponent.propTypes = WrappedComponent.propTypes;
-  // @ts-expect-error class component have defaultProps and functions do not and so should not be affected by this
   BaseComponent.defaultProps = WrappedComponent.defaultProps;
   const ThemeContext = ThemeManager.getThemeContext();
   if (ThemeContext) {

package/src/commons/baseComponent.js

@@ -8,12 +8,20 @@ import _includes from "lodash/includes";
 import _pickBy from "lodash/pickBy";
 import _pick from "lodash/pick";
 import React from 'react';
+// import PropTypes from 'prop-types';
 import { StyleSheet } from 'react-native';
 import { Colors } from "../style";
 import * as Modifiers from "./modifiers";
 export default function baseComponent(usePure) {
   const parent = usePure ? React.PureComponent : React.Component;
   class BaseComponent extends parent {
+    // static propTypes = {
+    //   ..._.mapValues(Typography, () => PropTypes.bool),
+    //   ..._.mapValues(Colors, () => PropTypes.bool),
+    //   useNativeDriver: PropTypes.bool,
+    // };
+
+    static extractOwnProps = Modifiers.extractOwnProps;
     constructor(props) {
       super(props);
       if (!this.styles) {