@ohos-ports/react-native-navigation 8.9.0-beta.1 → 8.9.0-beta.11

package/lib/cjs/processors/LayoutProcessorsStore.js

@@ -0,0 +1,42 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var LayoutProcessorsStore_exports = {};
+__export(LayoutProcessorsStore_exports, {
+  LayoutProcessorsStore: () => LayoutProcessorsStore
+});
+module.exports = __toCommonJS(LayoutProcessorsStore_exports);
+class LayoutProcessorsStore {
+  layoutProcessors = [];
+  addProcessor(processor) {
+    this.layoutProcessors.push(processor);
+    return {
+      remove: () => this.removeProcessor(processor)
+    };
+  }
+  getProcessors() {
+    return this.layoutProcessors;
+  }
+  removeProcessor(processor) {
+    this.layoutProcessors.splice(this.layoutProcessors.indexOf(processor));
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  LayoutProcessorsStore
+});

package/lib/cjs/processors/OptionProcessorsStore.js

@@ -0,0 +1,43 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var OptionProcessorsStore_exports = {};
+__export(OptionProcessorsStore_exports, {
+  OptionProcessorsStore: () => OptionProcessorsStore
+});
+module.exports = __toCommonJS(OptionProcessorsStore_exports);
+class OptionProcessorsStore {
+  optionsProcessorsByObjectPath = {};
+  addProcessor(optionPath, processor) {
+    if (!this.optionsProcessorsByObjectPath[optionPath]) this.optionsProcessorsByObjectPath[optionPath] = [];
+    this.optionsProcessorsByObjectPath[optionPath].push(processor);
+    return {
+      remove: () => this.removeProcessor(optionPath, processor)
+    };
+  }
+  getProcessors(optionPath) {
+    return this.optionsProcessorsByObjectPath[optionPath];
+  }
+  removeProcessor(optionPath, processor) {
+    this.optionsProcessorsByObjectPath[optionPath].splice(this.optionsProcessorsByObjectPath[optionPath].indexOf(processor));
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OptionProcessorsStore
+});

package/lib/cjs/types.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/react-native-navigation",
-  "version": "8.9.0-beta.1",
+  "version": "8.9.0-beta.11",
   "description": "React Native Navigation - truly native navigation for iOS and Android (HarmonyOS port)",
   "license": "MIT",
   "publishConfig": {
@@ -15,31 +15,30 @@
     "url": "https://github.com/ohos-ports/ohos-ports.git",
     "directory": "ports/react-native-navigation/8.9.0"
   },
-  "main": "./lib/module/index.js",
+  "main": "./lib/cjs/index.js",
   "types": "./lib/typescript/index.d.ts",
   "exports": {
     ".": {
       "types": "./lib/typescript/index.d.ts",
-      "default": "./lib/module/index.js"
+      "default": "./lib/cjs/index.js"
     },
     "./Mock": {
       "types": "./lib/typescript/Mock/index.d.ts",
-      "default": "./lib/module/Mock/index.js"
+      "default": "./lib/cjs/Mock/index.js"
     },
     "./package.json": "./package.json"
   },
   "files": [
     "lib",
-    "scripts",
+    "postinstall.js",
     "README.md",
     "LICENSE"
   ],
   "scripts": {
-    "postinstall": "node scripts/setup-esm-shim.js"
+    "postinstall": "node postinstall.js"
   },
   "peerDependencies": {
-    "react": "*",
-    "@ohos-ports/react-native": "^0.87.1-beta.1"
+    "react": "*"
   },
   "peerDependenciesMeta": {
     "@ohos-ports/remx": {
@@ -51,6 +50,8 @@
     "lodash": "4.18.1",
     "prop-types": "15.x.x",
     "react-lifecycles-compat": "^3.0.4",
-    "tslib": "1.9.3"
+    "tslib": "1.9.3",
+    "@ohos-ports/react-native": "^0.87.1-beta.2",
+    "react-native": "npm:@ohos-ports/react-native@^0.87.1-beta.2"
   }
 }

package/postinstall.js

@@ -0,0 +1,53 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+
+const REQUIRED_OVERRIDE = "npm:@ohos-ports/react-native@^0.87.1-beta.2";
+
+// npm sets INIT_CWD to the project root during postinstall
+const projectRoot = process.env.INIT_CWD || process.cwd();
+const pkgPath = path.join(projectRoot, "package.json");
+
+if (!fs.existsSync(pkgPath)) {
+  // Not a project context (e.g. running inside the package's own dir), skip
+  process.exit(0);
+}
+
+let pkg;
+try {
+  pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+} catch {
+  // Invalid package.json, skip silently
+  process.exit(0);
+}
+
+// Check if override already exists and matches
+const existing = pkg.overrides && pkg.overrides["react-native"];
+if (existing === REQUIRED_OVERRIDE) {
+  process.exit(0);
+}
+
+// Add/update overrides
+if (!pkg.overrides) {
+  pkg.overrides = {};
+}
+
+pkg.overrides["react-native"] = REQUIRED_OVERRIDE;
+
+try {
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+  console.log(
+    "[@ohos-ports/react-native-navigation] " +
+      'Automatically added "overrides.react-native" to your package.json. ' +
+      "Please run `npm install` again to apply the changes."
+  );
+} catch {
+  // Cannot write (read-only filesystem, permissions, etc.) — fall back to warning
+  console.warn(
+    "[@ohos-ports/react-native-navigation] " +
+      "Could not automatically add overrides to package.json. " +
+      'Please add this to your package.json manually:\n' +
+      JSON.stringify({ overrides: { "react-native": REQUIRED_OVERRIDE } }, null, 2)
+  );
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/statusbar/StatusBarPresenter.kt

@@ -1,212 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.statusbar
-
-import android.animation.Animator
-import android.app.Activity
-import android.graphics.Color
-import android.view.View
-import android.view.Window
-import com.reactnativenavigation.RNNFeatureToggles.isEnabled
-import com.reactnativenavigation.RNNToggles
-import com.reactnativenavigation.options.Options
-import com.reactnativenavigation.options.StatusBarOptions
-import com.reactnativenavigation.options.StatusBarOptions.TextColorScheme
-import com.reactnativenavigation.options.params.Bool
-import com.reactnativenavigation.utils.ColorUtils.isColorLight
-import com.reactnativenavigation.utils.StubAnimationListener.Companion.onAnimatorEnd
-import com.reactnativenavigation.utils.SystemUiUtils.clearStatusBarTranslucency
-import com.reactnativenavigation.utils.SystemUiUtils.getStatusBarColor
-import com.reactnativenavigation.utils.SystemUiUtils.hideStatusBar
-import com.reactnativenavigation.utils.SystemUiUtils.isTranslucent
-import com.reactnativenavigation.utils.SystemUiUtils.setStatusBarColor
-import com.reactnativenavigation.utils.SystemUiUtils.setStatusBarColorScheme
-import com.reactnativenavigation.utils.SystemUiUtils.setStatusBarTranslucent
-import com.reactnativenavigation.utils.SystemUiUtils.showStatusBar
-import com.reactnativenavigation.viewcontrollers.viewcontroller.StatusBarColorAnimator
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController
-import java.lang.ref.WeakReference
-
-class StatusBarPresenter private constructor(
-        activity: Activity,
-        private val sbColorAnimator: StatusBarColorAnimator = StatusBarColorAnimator(activity)) {
-
-    private val window = WeakReference(activity.window)
-    private var hasPendingColorAnim = false
-
-    fun applyOptions(viewController: ViewController<*>, options: StatusBarOptions) {
-        if (!hasPendingColorAnim) {
-            setStatusBarBackgroundColor(options)
-            setTranslucent(options)
-        }
-        setTextColorScheme(options)
-        setStatusBarVisible(viewController, options.visible)
-    }
-
-    fun mergeOptions(view: View, statusBar: StatusBarOptions) {
-        mergeStatusBarBackgroundColor(statusBar)
-        mergeTextColorScheme(statusBar)
-        mergeTranslucent(statusBar)
-        mergeStatusBarVisible(view, statusBar.visible)
-    }
-
-    fun onConfigurationChanged(options: StatusBarOptions) {
-        setStatusBarBackgroundColor(options)
-        setTextColorScheme(options)
-    }
-
-    fun bindViewController(newOptions: StatusBarOptions) {
-        if (!isEnabled(RNNToggles.TOP_BAR_COLOR_ANIMATION__TABS)) {
-            return
-        }
-
-        if (newOptions.backgroundColor.canApplyValue()) {
-            val currentColor = getCurrentStatusBarBackgroundColor() ?: return
-            val newColor = getStatusBarBackgroundColor(newOptions)
-            createStatusBarColorAnimation(
-                from = currentColor,
-                to = newColor,
-                translucent = newOptions.translucent.isTrue,
-            ).start()
-        }
-    }
-
-    fun getStatusBarPushAnimation(appearingOptions: Options): Animator? =
-        if (isEnabled(RNNToggles.TOP_BAR_COLOR_ANIMATION__PUSH)) {
-            getStatusBarColorAnimation(appearingOptions.statusBar)
-        } else null
-
-    fun getStatusBarPopAnimation(appearingOptions: Options, disappearingOptions: Options): Animator? =
-        if (isEnabled(RNNToggles.TOP_BAR_COLOR_ANIMATION__PUSH)) {
-            getStatusBarColorAnimation(appearingOptions.statusBar)
-        } else null
-
-    private fun setStatusBarBackgroundColor(statusBar: StatusBarOptions) {
-        if (statusBar.backgroundColor.canApplyValue()) {
-            val statusBarBackgroundColor: Int = getStatusBarBackgroundColor(statusBar)
-            setStatusBarBackgroundColor(statusBarBackgroundColor, statusBar.translucent.isTrue)
-        }
-    }
-
-    private fun setStatusBarBackgroundColor(color: Int, translucent: Boolean) {
-        setStatusBarColor(window.get(), color, translucent)
-    }
-
-    private fun getStatusBarBackgroundColor(statusBar: StatusBarOptions): Int {
-        val defaultColor =
-            if (statusBar.visible.isTrueOrUndefined) Color.BLACK else Color.TRANSPARENT
-        return statusBar.backgroundColor.get(defaultColor)!!
-    }
-
-    private fun setTextColorScheme(statusBar: StatusBarOptions) {
-        val view = window.get()?.decorView
-        //View.post is a Workaround, added to solve internal Samsung
-        //Android 9 issues. For more info see https://github.com/wix/react-native-navigation/pull/7231
-        view?.post {
-            setStatusBarColorScheme(
-                window.get(),
-                view,
-                isDarkTextColorScheme(statusBar)
-            )
-        }
-    }
-
-    private fun setTranslucent(options: StatusBarOptions) {
-        val window = window.get()
-        if (options.translucent.isTrue) {
-            setStatusBarTranslucent(window)
-        } else if (isTranslucent(window)) {
-            clearStatusBarTranslucency(window)
-        }
-    }
-
-    private fun setStatusBarVisible(viewController: ViewController<*>, visible: Bool) {
-        val window = window.get() ?: return
-        val view = if (viewController.view != null) viewController.view else window.decorView
-        if (visible.isFalse) {
-            hideStatusBar(window, view)
-        } else {
-            showStatusBar(window, view)
-        }
-    }
-
-    private fun mergeStatusBarBackgroundColor(statusBar: StatusBarOptions) {
-        if (statusBar.backgroundColor.hasValue()) {
-            val statusBarBackgroundColor = getStatusBarBackgroundColor(statusBar)
-            setStatusBarColor(
-                window.get(), statusBarBackgroundColor,
-                statusBar.translucent.isTrue
-            )
-        }
-    }
-
-    private fun mergeTextColorScheme(statusBar: StatusBarOptions) {
-        if (!statusBar.textColorScheme.hasValue()) return
-        setTextColorScheme(statusBar)
-    }
-
-    private fun mergeTranslucent(options: StatusBarOptions) {
-        val window: Window = window.get() ?: return
-        if (options.translucent.isTrue) {
-            setStatusBarTranslucent(window)
-        } else if (options.translucent.isFalse && isTranslucent(window)) {
-            clearStatusBarTranslucency(window)
-        }
-    }
-
-    private fun mergeStatusBarVisible(view: View, visible: Bool) {
-        if (visible.hasValue()) {
-            if (visible.isTrue) {
-                showStatusBar(window.get(), view)
-            } else {
-                hideStatusBar(window.get(), view)
-            }
-        }
-    }
-
-    private fun isDarkTextColorScheme(statusBar: StatusBarOptions): Boolean {
-        if (statusBar.textColorScheme == TextColorScheme.Dark) {
-            return true
-        }
-
-        if (statusBar.textColorScheme == TextColorScheme.Light) {
-            return false
-        }
-        return isColorLight(getStatusBarBackgroundColor(statusBar))
-    }
-
-    private fun getStatusBarColorAnimation(statusBarOptions: StatusBarOptions): Animator? {
-        if (isEnabled(RNNToggles.TOP_BAR_COLOR_ANIMATION__TABS)) {
-            getCurrentStatusBarBackgroundColor()?.let { currentColor ->
-                val targetColor = statusBarOptions.backgroundColor
-
-                if (targetColor.hasValue()) {
-                    val translucent = statusBarOptions.translucent.isTrue
-                    return createStatusBarColorAnimation(
-                        from = currentColor,
-                        to = targetColor.get(),
-                        translucent = translucent,
-                    )
-                }
-            }
-        }
-        return null
-    }
-
-    private fun createStatusBarColorAnimation(from: Int, to: Int, translucent: Boolean): Animator =
-        sbColorAnimator.getAnimator(from, to, translucent).apply {
-            addListener(onAnimatorEnd {
-                hasPendingColorAnim = false
-            })
-            hasPendingColorAnim = true
-        }
-
-    private fun getCurrentStatusBarBackgroundColor() =
-        getStatusBarColor(window.get())
-
-    companion object {
-        lateinit var instance: StatusBarPresenter
-
-        fun init(activity: Activity) {
-            instance = StatusBarPresenter(activity)
-        }
-    }
-}