@openeditor/react-native-prose-editor 0.0.13 → 0.0.15

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

@@ -776,36 +776,31 @@ class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
 
     private fun calloutView(node: JSONObject, depth: Int, path: List<Int>): View {
         val density = resources.displayMetrics.density
-        val tone = node.optJSONObject("attrs")?.optString("tone", "info") ?: "info"
-        val accent = when (tone) {
-            "success" -> 0xFF16A34A.toInt()
-            "warning" -> 0xFFD97706.toInt()
-            "danger" -> 0xFFDC2626.toInt()
-            else -> 0xFF2563EB.toInt()
-        }
         val container = LinearLayout(context).apply {
-            orientation = LinearLayout.VERTICAL
+            orientation = LinearLayout.HORIZONTAL
+            gravity = android.view.Gravity.TOP
             val padding = (12 * density).toInt()
             setPadding(padding, padding, padding, padding)
             background = roundedDrawable(
-                Color.argb(24, Color.red(accent), Color.green(accent), Color.blue(accent)),
-                Color.argb(140, Color.red(accent), Color.green(accent), Color.blue(accent)),
-                1f,
+                currentTheme?.codeBlock?.backgroundColor ?: 0xFFF5F5F5.toInt(),
+                Color.TRANSPARENT,
+                0f,
                 10f
             )
         }
         container.addView(TextView(context).apply {
-            text = tone.replaceFirstChar { it.uppercase() }
-            setTextColor(accent)
-            setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
-            setTypeface(typeface, Typeface.BOLD)
-            isClickable = this@NativeBlockEditorSurface.isEditable
-            setOnClickListener { cycleCalloutTone(node) }
+            text = node.optJSONObject("attrs")?.optString("emoji", "💡") ?: "💡"
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 20f)
         })
+        val content = LinearLayout(context).apply {
+            orientation = LinearLayout.VERTICAL
+            setPadding((10 * density).toInt(), 0, 0, 0)
+        }
         val children = node.optJSONArray("children")
         for (index in 0 until (children?.length() ?: 0)) {
-            children?.optJSONObject(index)?.let { container.addView(viewForNode(it, depth + 1, path + index)) }
+            children?.optJSONObject(index)?.let { content.addView(viewForNode(it, depth + 1, path + index)) }
         }
+        container.addView(content, LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f))
         return container
     }
 
@@ -833,14 +828,6 @@ class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
         }
     }
 
-    private fun cycleCalloutTone(node: JSONObject) {
-        if (!isEditable) return
-        val tones = listOf("info", "success", "warning", "danger")
-        val current = node.optJSONObject("attrs")?.optString("tone", "info") ?: "info"
-        val next = tones[(tones.indexOf(current).coerceAtLeast(0) + 1) % tones.size]
-        updateNodeAttrs(node, JSONObject().put("tone", next))
-    }
-
     private fun updateNodeAttrs(node: JSONObject, patch: JSONObject) {
         if (currentEditorId == 0L) return
         val attrs = JSONObject(node.optJSONObject("attrs")?.toString() ?: "{}")

package/ios/NativeBlockEditorSurface.swift

@@ -864,37 +864,27 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
     }
 
     private func calloutView(for node: [String: Any], depth: Int, path: [Int]) -> UIView {
-        let tone = stringAttr(node, "tone") ?? "info"
-        let accent: UIColor = switch tone {
-        case "success": .systemGreen
-        case "warning": .systemOrange
-        case "danger": .systemRed
-        default: .systemBlue
-        }
         let container = UIStackView()
-        container.axis = .vertical
-        container.spacing = 8
+        container.axis = .horizontal
+        container.alignment = .top
+        container.spacing = 10
         container.layoutMargins = UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
         container.isLayoutMarginsRelativeArrangement = true
-        container.backgroundColor = accent.withAlphaComponent(0.1)
-        container.layer.borderColor = accent.withAlphaComponent(0.55).cgColor
-        container.layer.borderWidth = 1
+        container.backgroundColor = UIColor.secondarySystemBackground
         container.layer.cornerRadius = 10
 
-        let toneButton = UIButton(type: .system)
-        toneButton.setTitle(tone.capitalized, for: .normal)
-        toneButton.setTitleColor(accent, for: .normal)
-        toneButton.titleLabel?.font = .systemFont(ofSize: 12, weight: .semibold)
-        toneButton.contentHorizontalAlignment = .leading
-        toneButton.isEnabled = isEditable
-        toneButton.addAction(UIAction { [weak self] _ in
-            self?.cycleCalloutTone(node)
-        }, for: .touchUpInside)
-        container.addArrangedSubview(toneButton)
+        let emoji = UILabel()
+        emoji.text = stringAttr(node, "emoji") ?? "💡"
+        emoji.font = .systemFont(ofSize: 20)
+        container.addArrangedSubview(emoji)
 
+        let content = UIStackView()
+        content.axis = .vertical
+        content.spacing = 4
         for (index, child) in (node["children"] as? [[String: Any]] ?? []).enumerated() {
-            container.addArrangedSubview(view(for: child, depth: depth + 1, path: path + [index]))
+            content.addArrangedSubview(view(for: child, depth: depth + 1, path: path + [index]))
         }
+        container.addArrangedSubview(content)
         return container
     }
 
@@ -932,14 +922,6 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
         }
     }
 
-    private func cycleCalloutTone(_ node: [String: Any]) {
-        guard isEditable else { return }
-        let tones = ["info", "success", "warning", "danger"]
-        let current = stringAttr(node, "tone") ?? "info"
-        let next = tones[((tones.firstIndex(of: current) ?? 0) + 1) % tones.count]
-        updateNodeAttrs(node, patch: ["tone": next])
-    }
-
     private func updateNodeAttrs(_ node: [String: Any], patch: [String: Any]) {
         guard currentEditorId != 0 else { return }
         var attrs = node["attrs"] as? [String: Any] ?? [:]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openeditor/react-native-prose-editor",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "OpenEditor-owned native rich text editor engine for React Native",
   "license": "Apache-2.0",
   "homepage": "https://github.com/EasyLink-HQ/openeditor",