uilib-native 5.0.0 → 5.0.1-snapshot.7783

package/android/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 project.ext {
-    buildToolsVersion = rootProject.ext.has("buildToolsVersion") ? rootProject.ext.buildToolsVersion : '35.0.0'
+    buildToolsVersion = rootProject.ext.has("buildToolsVersion") ? rootProject.ext.buildToolsVersion : '36.0.0'
     minSdkVersion = rootProject.ext.has("minSdkVersion") ? rootProject.ext.minSdkVersion : 24
-    compileSdkVersion = rootProject.ext.has("compileSdkVersion") ? rootProject.ext.compileSdkVersion : 35
-    targetSdkVersion = rootProject.ext.has("targetSdkVersion") ? rootProject.ext.targetSdkVersion : 34
+    compileSdkVersion = rootProject.ext.has("compileSdkVersion") ? rootProject.ext.compileSdkVersion : 36
+    targetSdkVersion = rootProject.ext.has("targetSdkVersion") ? rootProject.ext.targetSdkVersion : 36
     supportLibVersion = rootProject.ext.has("supportLibVersion") ? rootProject.ext.supportLibVersion  : '28.0.0'
 }
 

package/components/HighlighterOverlayView/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { type JSX } 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): React.JSX.Element;
+    (props: HighlighterOverlayViewProps): JSX.Element;
     displayName: string;
 };
 export default HighlighterOverlayView;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import { type JSX } 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): React.JSX.Element;
+    (props: HighlighterOverlayViewProps): JSX.Element;
     displayName: string;
 };
 export default HighlighterOverlayView;

package/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.ReactChild | React.ReactChild[];
+    children?: React.ReactNode;
 };
 export default class CustomKeyboardViewBase<T extends CustomKeyboardViewBaseProps> extends Component<T> {
     static defaultProps: {

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

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

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

@@ -6,7 +6,7 @@ export type KeyboardAccessoryViewProps = kbTrackingViewProps & {
     /**
      * Content to be rendered above the keyboard
      */
-    renderContent?: () => React.ReactElement;
+    renderContent?: () => React.ReactElement<any>;
     /**
      * 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.ReactChild;
+    children?: React.ReactNode;
 };
 /**
  * @description: View that allows replacing the default keyboard with other components

package/components/Keyboard/KeyboardAccessoryView/index.js

@@ -141,7 +141,9 @@ 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/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.ios.js

@@ -18,7 +18,9 @@ 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/components/Keyboard/KeyboardTrackingView/index.d.ts

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

package/components/Keyboard/KeyboardTrackingView/index.js

@@ -8,15 +8,16 @@ 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 {...others} ref={ref}>
+  return <KeyboardTrackingViewContainer {...defaultProps} {...others} ref={ref}>
       {children}
     </KeyboardTrackingViewContainer>;
 });
-export default KeyboardTrackingView;
-// @ts-expect-error
-KeyboardTrackingView.scrollBehaviors = SCROLL_BEHAVIORS;
+KeyboardTrackingView.defaultProps = defaultProps;
+KeyboardTrackingView.scrollBehaviors = SCROLL_BEHAVIORS;
+export default KeyboardTrackingView;

package/components/Keyboard/index.d.ts

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

package/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m

@@ -207,7 +207,9 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         {
             if(_scrollViewToManage == nil)
             {
-                if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"]) {
+                if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"] &&
+                    subview.superview != self) {
+                    
                     UIScrollView *scrollView = [self extractUIScrollView:subview];
                     
                     if ([scrollView isKindOfClass:[UIScrollView class]])
@@ -434,9 +436,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 
 - (void)_updateScrollViewInsets
 {
-    // Because our view is now being transformed inside it's superview (from RN77 it inherited a RCTLegacyViewManagerInteropComponentView as superview) we no longer need the scrollview to also update because it's inside our view
-    return;
-    /*if(self.scrollViewToManage != nil)
+    if(self.scrollViewToManage != nil)
     {
         UIEdgeInsets insets = self.scrollViewToManage.contentInset;
         CGFloat bottomSafeArea = [self getBottomSafeArea];
@@ -483,7 +483,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
             insets.bottom = bottomInset;
         }
         self.scrollViewToManage.scrollIndicatorInsets = insets;
-    }*/
+    }
 }
 
 #pragma mark - bottom view

package/package.json

@@ -1,23 +1,22 @@
 {
-  "name": "uilib-native",
-  "version": "5.0.0",
-  "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"
-  }
+    "name": "uilib-native",
+    "version": "5.0.1-snapshot.7783",
+    "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"
+    }
 }

package/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: './lib/ReactNativeUiLib.podspec'
+      //   podspecPath: './uilib-native/ReactNativeUiLib.podspec'
       // },
       android: {
         sourceDir: './android/',

package/scripts/releaseNative.js

@@ -1,72 +0,0 @@
-const exec = require('shell-utils').exec;
-const p = require('path');
-
-// Export buildkite variables for Release build
-// We cast toString() because function returns 'object'
-const IS_SNAPSHOT = process.env.BUILDKITE_MESSAGE?.match(/^snapshot$/i);
-const VERSION_TAG = IS_SNAPSHOT ? 'snapshot' : 'latest';
-
-function run() {
-  if (!validateEnv()) {
-    console.log('Do not release native');
-    return;
-  }
-
-  console.log('Release native');
-  const packageJsonVersion = require('../package.json').version;
-  const currentPublished = findCurrentPublishedVersion();
-  const newVersion = IS_SNAPSHOT
-    ? `${packageJsonVersion}-snapshot.${process.env.BUILDKITE_BUILD_NUMBER}`
-    : packageJsonVersion;
-
-  if (currentPublished !== packageJsonVersion) {
-    createNpmRc();
-    versionTagAndPublish(currentPublished, newVersion);
-  }
-}
-
-function validateEnv() {
-  if (!process.env.CI) {
-    throw new Error('releasing is only available from CI');
-  }
-  return process.env.BUILDKITE_BRANCH === 'master' || process.env.BUILDKITE_MESSAGE === 'snapshot';
-}
-
-function createNpmRc() {
-  exec.execSync('rm -f package-lock.json');
-  const npmrcPath = p.resolve(`${__dirname}/.npmrc`);
-  exec.execSync(`cp -rf ${npmrcPath} .`);
-}
-
-function versionTagAndPublish(currentPublished, newVersion) {
-  console.log(`current published version: ${currentPublished}`);
-  console.log(`Publishing version: ${newVersion}`);
-  tryPublishAndTag(newVersion);
-}
-
-function findCurrentPublishedVersion() {
-  return exec.execSyncRead(`npm view ${process.env.npm_package_name} dist-tags.latest`);
-}
-
-function tryPublishAndTag(version) {
-  try {
-    tagAndPublish(version);
-    console.log(`Released ${version}`);
-  } catch (err) {
-    console.log(`Failed to release ${version}`, err);
-  }
-}
-
-function tagAndPublish(newVersion) {
-  console.log(`trying to publish ${newVersion}...`);
-  if (IS_SNAPSHOT) {
-    exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
-  }
-  exec.execSync(`npm publish --tag ${VERSION_TAG}`);
-  if (!IS_SNAPSHOT) {
-    exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
-  }
-  exec.execSyncSilent(`git push deploy ${newVersion} || true`);
-}
-
-run();