@apollohg/react-native-prose-editor 0.5.4 → 0.5.5

package/android/src/main/java/com/apollohg/editor/NativeProseViewerExpoView.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
+import kotlin.math.abs
 import org.json.JSONArray
 
 class NativeProseViewerExpoView(
@@ -31,6 +32,7 @@ class NativeProseViewerExpoView(
     private var isCollapsedEmptyContent = false
     private var enableLinkTaps = true
     private var interceptLinkTaps = false
+    internal var suppressContentHeightEventsForTesting = false
 
     init {
         proseView.setBaseStyle(
@@ -39,6 +41,9 @@ class NativeProseViewerExpoView(
             Color.TRANSPARENT
         )
         proseView.isEditable = false
+        proseView.inputType = android.text.InputType.TYPE_CLASS_TEXT or
+            android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE or
+            android.text.InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
         proseView.setImageResizingEnabled(false)
         proseView.setHeightBehavior(EditorHeightBehavior.AUTO_GROW)
         proseView.isFocusable = false
@@ -88,10 +93,7 @@ class NativeProseViewerExpoView(
         if (lastRenderJson == renderJson) return
         lastRenderJson = renderJson
         applyRenderJson()
-        post {
-            requestLayout()
-            emitContentHeightIfNeeded(force = true)
-        }
+        requestLayout()
     }
 
     fun setThemeJson(themeJson: String?) {
@@ -99,10 +101,7 @@ class NativeProseViewerExpoView(
         lastThemeJson = themeJson
         proseView.applyTheme(EditorTheme.fromJson(themeJson))
         applyRenderJson()
-        post {
-            requestLayout()
-            emitContentHeightIfNeeded(force = true)
-        }
+        requestLayout()
     }
 
     fun setCollapsesWhenEmpty(collapsesWhenEmpty: Boolean?) {
@@ -125,6 +124,7 @@ class NativeProseViewerExpoView(
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         if (isCollapsedEmptyContent) {
             setMeasuredDimension(resolveSize(0, widthMeasureSpec), 0)
+            emitContentHeightIfNeeded()
             return
         }
 
@@ -139,12 +139,20 @@ class NativeProseViewerExpoView(
         )
         proseView.measure(childWidthSpec, childHeightSpec)
 
+        val resolvedContentHeight = proseView.resolveAutoGrowHeight()
         val desiredWidth = proseView.measuredWidth + paddingLeft + paddingRight
-        val desiredHeight = proseView.measuredHeight + paddingTop + paddingBottom
+        val desiredHeight = resolvedContentHeight + paddingTop + paddingBottom
+        val measuredHeight = when (View.MeasureSpec.getMode(heightMeasureSpec)) {
+            View.MeasureSpec.AT_MOST -> desiredHeight.coerceAtMost(
+                View.MeasureSpec.getSize(heightMeasureSpec)
+            )
+            else -> desiredHeight
+        }
         setMeasuredDimension(
             resolveSize(desiredWidth, widthMeasureSpec),
-            resolveSize(desiredHeight, heightMeasureSpec)
+            measuredHeight
         )
+        emitContentHeightIfNeeded(measuredContentHeight = desiredHeight)
     }
 
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
@@ -177,11 +185,16 @@ class NativeProseViewerExpoView(
         proseView.visibility = if (isCollapsedEmptyContent) View.GONE else View.VISIBLE
     }
 
-    private fun emitContentHeightIfNeeded(force: Boolean = false) {
+    private fun emitContentHeightIfNeeded(
+        force: Boolean = false,
+        measuredContentHeight: Int? = null
+    ) {
         val contentHeight = if (isCollapsedEmptyContent) {
             0
         } else {
-            (measureContentHeightPx() + paddingTop + paddingBottom).coerceAtLeast(0)
+            (
+                measuredContentHeight ?: (measureContentHeightPx() + paddingTop + paddingBottom)
+            ).coerceAtLeast(0)
         }
         if (contentHeight <= 0 && !isCollapsedEmptyContent) {
             return
@@ -190,6 +203,9 @@ class NativeProseViewerExpoView(
             return
         }
         lastEmittedContentHeight = contentHeight
+        if (suppressContentHeightEventsForTesting) {
+            return
+        }
         onContentHeightChange(mapOf("contentHeight" to contentHeight))
     }
 
@@ -198,16 +214,22 @@ class NativeProseViewerExpoView(
             return 0
         }
 
-        val currentMeasuredHeight = proseView.measuredHeight
-        if (currentMeasuredHeight > 0 && proseView.layout != null) {
-            return currentMeasuredHeight
-        }
-
         val availableWidthPx = resolveAvailableWidthPx()
-        val childWidthSpec = View.MeasureSpec.makeMeasureSpec(availableWidthPx, View.MeasureSpec.EXACTLY)
-        val childHeightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
-        proseView.measure(childWidthSpec, childHeightSpec)
-        return proseView.measuredHeight
+        if (
+            proseView.measuredWidth <= 0 ||
+            abs(proseView.measuredWidth - availableWidthPx) > 1
+        ) {
+            val childWidthSpec = View.MeasureSpec.makeMeasureSpec(
+                availableWidthPx,
+                View.MeasureSpec.EXACTLY
+            )
+            val childHeightSpec = View.MeasureSpec.makeMeasureSpec(
+                0,
+                View.MeasureSpec.UNSPECIFIED
+            )
+            proseView.measure(childWidthSpec, childHeightSpec)
+        }
+        return proseView.resolveAutoGrowHeight()
     }
 
     private fun resolveAvailableWidthPx(): Int {

package/dist/NativeProseViewer.js

@@ -4,6 +4,7 @@ exports.NativeProseViewer = NativeProseViewer;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const expo_modules_core_1 = require("expo-modules-core");
+const react_native_1 = require("react-native");
 const addons_1 = require("./addons");
 const EditorTheme_1 = require("./EditorTheme");
 const schemas_1 = require("./schemas");
@@ -381,12 +382,9 @@ function NativeProseViewer({ ...props }) {
     const renderJsonIsCollapsedEmpty = (0, react_1.useMemo)(() => collapseTrailingEmptyParagraphs &&
         renderElementsJsonContainsOnlyEmptyParagraphs(renderJson), [collapseTrailingEmptyParagraphs, renderJson]);
     const [contentHeight, setContentHeight] = (0, react_1.useState)(null);
-    const allowContentHeightShrinkRef = (0, react_1.useRef)(true);
-    (0, react_1.useEffect)(() => {
-        allowContentHeightShrinkRef.current = true;
-    }, [resolvedContentRevision, renderJson, themeJson]);
     const handleContentHeightChange = (0, react_1.useCallback)((event) => {
-        const nextHeight = event.nativeEvent.contentHeight;
+        const density = react_native_1.Platform.OS === 'android' ? react_native_1.PixelRatio.get() : 1;
+        const nextHeight = Math.ceil(event.nativeEvent.contentHeight / density);
         if (nextHeight < 0)
             return;
         if (nextHeight === 0 && !renderJsonIsCollapsedEmpty)
@@ -395,16 +393,7 @@ function NativeProseViewer({ ...props }) {
             setContentHeight((currentHeight) => currentHeight === 0 ? currentHeight : 0);
             return;
         }
-        setContentHeight((currentHeight) => currentHeight == null ||
-            nextHeight >= currentHeight ||
-            allowContentHeightShrinkRef.current
-            ? (() => {
-                allowContentHeightShrinkRef.current = false;
-                return currentHeight === nextHeight
-                    ? currentHeight
-                    : nextHeight;
-            })()
-            : currentHeight);
+        setContentHeight((currentHeight) => currentHeight === nextHeight ? currentHeight : nextHeight);
     }, [renderJsonIsCollapsedEmpty]);
     const handlePressMention = (0, react_1.useCallback)((event) => {
         if (!onPressMention)

package/ios/EditorCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/NativeProseViewerExpoView.swift

@@ -11,7 +11,6 @@ final class NativeProseViewerExpoView: ExpoView {
     private var lastThemeJSON: String?
     private var lastEmittedContentHeight: CGFloat = 0
     private var lastMeasuredWidth: CGFloat = 0
-    private var allowContentHeightShrink = true
     private var collapsesWhenEmpty = true
     private var isCollapsedEmptyContent = false
     private var enableLinkTaps = true
@@ -57,7 +56,6 @@ final class NativeProseViewerExpoView: ExpoView {
         let nextValue = collapses ?? true
         guard collapsesWhenEmpty != nextValue else { return }
         collapsesWhenEmpty = nextValue
-        allowContentHeightShrink = true
         updateCollapsedEmptyState()
         setNeedsLayout()
         emitContentHeightIfNeeded(force: true)
@@ -66,14 +64,12 @@ final class NativeProseViewerExpoView: ExpoView {
     func setRenderJson(_ renderJson: String?) {
         guard lastRenderJSON != renderJson else { return }
         lastRenderJSON = renderJson
-        allowContentHeightShrink = true
         applyRenderJSON()
     }
 
     func setThemeJson(_ themeJson: String?) {
         guard lastThemeJSON != themeJson else { return }
         lastThemeJSON = themeJson
-        allowContentHeightShrink = true
         let theme = EditorTheme.from(json: themeJson)
         textView.applyTheme(theme)
         let cornerRadius = theme?.borderRadius ?? 0
@@ -112,9 +108,9 @@ final class NativeProseViewerExpoView: ExpoView {
         updateCollapsedEmptyState()
         textView.applyRenderJSON(lastRenderJSON ?? "[]")
         textView.isHidden = isCollapsedEmptyContent
+        lastMeasuredWidth = 0
         invalidateIntrinsicContentSize()
         setNeedsLayout()
-        emitContentHeightIfNeeded(force: true)
     }
 
     private func updateCollapsedEmptyState() {
@@ -131,16 +127,12 @@ final class NativeProseViewerExpoView: ExpoView {
         if isCollapsedEmptyContent {
             contentHeight = 0
         } else {
-            let resolvedWidth = bounds.width > 0
-                ? bounds.width
-                : (superview?.bounds.width ?? UIScreen.main.bounds.width)
+            guard bounds.width > 0 else { return }
             let fittedHeight = measuredHeight
-                ?? textView.measuredAutoGrowHeightForTesting(width: resolvedWidth)
+                ?? textView.measuredAutoGrowHeightForTesting(width: bounds.width)
             contentHeight = ceil(fittedHeight)
             guard contentHeight > 0 else { return }
         }
-        guard allowContentHeightShrink || contentHeight >= lastEmittedContentHeight else { return }
-        allowContentHeightShrink = false
         guard force || abs(contentHeight - lastEmittedContentHeight) > 0.5 else { return }
         lastEmittedContentHeight = contentHeight
         invalidateIntrinsicContentSize()

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apollohg/react-native-prose-editor",
-    "version": "0.5.4",
+    "version": "0.5.5",
     "description": "Native rich text editor with Rust core for React Native",
     "license": "Apache-2.0",
     "homepage": "https://github.com/apollohg/react-native-prose-editor",