@apollohg/react-native-rich-text-editor 2.0.4 → 2.0.6

package/android/src/main/java/com/apollohg/editor/viewer/AndroidProseLayoutEngine.kt

@@ -90,7 +90,9 @@ private data class PreparedMarker(
     val ascentPx: Int,
     val baselinePx: Int,
     val checked: Boolean,
-    val checkbox: com.apollohg.editor.EditorElementStyle? = null
+    val checkbox: com.apollohg.editor.EditorElementStyle? = null,
+    val color: Int? = null,
+    val gapPx: Int? = null
 )
 
 internal const val PREPARED_LIST_MARKER_GAP_DP = 6f
@@ -251,7 +253,8 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                         ancestor.context,
                         nestingDepth,
                         theme.paintFor(block),
-                        theme
+                        theme,
+                        markerAncestors(block, nestingDepth)
                     )
                 }
             }
@@ -259,7 +262,9 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
         val containerBounds = mutableMapOf<Int, Rect>()
         val sheet = theme.sourceTheme?.styleSheet
         val leafBoxes = visibleBlocks.mapIndexed { index, block ->
-            val box = sheet?.box(block.nodeType)?.scaled(density) ?: EditorBoxStyle()
+            val box =
+                sheet?.box(block.nodeType, block.containers.map { it.nodeType })?.scaled(density)
+                    ?: EditorBoxStyle()
             val parent = block.containers.lastOrNull()
             if (block.nodeType == "paragraph" && parent?.nodeType == "blockquote" &&
                 parent.lastLeaf == index
@@ -288,13 +293,23 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                 }
                 val bottom = (
                     previous.getOrNull(common)?.let {
-                        sheet.box(it.nodeType).scaled(density).margin.bottom
+                        sheet.box(
+                            it.nodeType,
+                            previous.take(common).map {
+                                it.nodeType
+                            }
+                        ).scaled(density).margin.bottom
                     }
                         ?: leafBoxes[index - 1].margin.bottom
                     ).toInt()
                 val top = (
                     containers.getOrNull(common)?.let {
-                        sheet.box(it.nodeType).scaled(density).margin.top
+                        sheet.box(
+                            it.nodeType,
+                            containers.take(common).map {
+                                it.nodeType
+                            }
+                        ).scaled(density).margin.top
                     }
                         ?: leafBoxes[index].margin.top
                     ).toInt()
@@ -302,7 +317,13 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
             }
             var containerInset = EditorEdges()
             containers.forEach { ancestor ->
-                val box = sheet!!.box(ancestor.nodeType).scaled(density)
+                val box = sheet!!.box(
+                    ancestor.nodeType,
+                    containers.takeWhile {
+                        it.identity !=
+                            ancestor.identity
+                    }.map { it.nodeType }
+                ).scaled(density)
                 if (ancestor.firstLeaf == index) {
                     cursorY += box.margin.top.toInt()
                     containerBounds[ancestor.identity] =
@@ -379,7 +400,13 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
             cursorY = prepared.nextY
             containers.asReversed().forEach { ancestor ->
                 if (ancestor.lastLeaf == index) {
-                    val box = sheet!!.box(ancestor.nodeType).scaled(density)
+                    val box = sheet!!.box(
+                        ancestor.nodeType,
+                        containers.takeWhile {
+                            it.identity !=
+                                ancestor.identity
+                        }.map { it.nodeType }
+                    ).scaled(density)
                     cursorY += box.inset.bottom.toInt()
                     containerBounds[ancestor.identity]?.bottom = cursorY
                     cursorY += box.margin.bottom.toInt()
@@ -420,7 +447,13 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                     PreparedProseFragment(
                         PreparedProseFragmentKind.BACKGROUND,
                         clip,
-                        box = sheet.box(ancestor.nodeType).scaled(density),
+                        box = sheet.box(
+                            ancestor.nodeType,
+                            visibleBlocks[index].containers.takeWhile {
+                                it.identity !=
+                                    ancestor.identity
+                            }.map { it.nodeType }
+                        ).scaled(density),
                         decorationBounds = bounds
                     )
                 }
@@ -545,17 +578,19 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
         val firstMarkers = ancestorMarkers.filter { (ancestor, _) ->
             ancestor.isFirstRenderableLeaf
         }
-        fun listStyle(ancestor: ViewerListItemAncestor) = theme.sourceTheme?.styleSheet?.get(
-            if (ancestor.context.kind ==
-                "task"
-            ) {
-                "taskList"
-            } else if (ancestor.context.ordered) {
-                "orderedList"
-            } else {
-                "bulletList"
-            }
-        )
+        fun listStyle(ancestor: ViewerListItemAncestor) =
+            theme.sourceTheme?.styleSheet?.resolveElement(
+                if (ancestor.context.kind ==
+                    "task"
+                ) {
+                    "taskList"
+                } else if (ancestor.context.ordered) {
+                    "orderedList"
+                } else {
+                    "bulletList"
+                },
+                markerAncestors(block, ancestors.indexOf(ancestor)).dropLast(2)
+            )
         fun listIndent(ancestor: ViewerListItemAncestor) =
             listStyle(ancestor)?.indent?.times(theme.density)?.toInt() ?: theme.listIndentPx
         val baseListInset = if (ancestors.isEmpty()) {
@@ -578,7 +613,7 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                     marker.widthPx +
                         (
                             marker.checkbox?.gap?.times(theme.density)?.toInt()
-                                ?: theme.listMarkerGapPx
+                                ?: marker.gapPx ?: theme.listMarkerGapPx
                             )
                     )
         }
@@ -722,10 +757,16 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                                 PreparedProseFragmentKind.IMAGE,
                                 bounds,
                                 color =
-                                    theme.sourceTheme?.styleSheet?.box("image")?.backgroundColor
+                                    theme.sourceTheme?.styleSheet?.box(
+                                        "image",
+                                        block.containers.map {
+                                            it.nodeType
+                                        }
+                                    )?.backgroundColor
                                         ?: 0xFFF2F2F7.toInt(),
                                 box = theme.sourceTheme?.styleSheet?.box(
-                                    "image"
+                                    "image",
+                                    block.containers.map { it.nodeType }
                                 )?.scaled(theme.density)?.let {
                                     it.copy(
                                         border = EditorEdges(),
@@ -736,7 +777,12 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                                     )
                                 },
                                 resizeMode =
-                                    theme.sourceTheme?.styleSheet?.get("image")?.resizeMode
+                                    theme.sourceTheme?.styleSheet?.resolveElement(
+                                        "image",
+                                        block.containers.map {
+                                            it.nodeType
+                                        }
+                                    )?.resizeMode
                                         ?: "contain"
                             )
                         ),
@@ -750,20 +796,32 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
             }
         }
         if (block.nodeType == "horizontalRule" || block.nodeType == "horizontal_rule") {
+            val sheet = theme.sourceTheme?.styleSheet
+            val ancestors = block.containers.map { it.nodeType }
+            val ruleStyle = sheet?.resolveElement("horizontalRule", ancestors)
+            val thickness = if (
+                sheet?.hasMatchingRuleProperty("horizontalRule", ancestors, "height") == true
+            ) {
+                ruleStyle?.height?.times(theme.density)?.toInt() ?: theme.ruleThicknessPx
+            } else {
+                theme.ruleThicknessPx
+            }
             val ruleTop = cursorY + theme.ruleMarginPx
             val ruleLeft = theme.insetLeftPx + listInset + quoteInset
             val ruleRight = max(
                 ruleLeft + 1,
                 theme.insetLeftPx + contentWidth - listInset - quoteInset
             )
-            val rule = Rect(ruleLeft, ruleTop, ruleRight, ruleTop + theme.ruleThicknessPx)
+            val rule = Rect(ruleLeft, ruleTop, ruleRight, ruleTop + thickness)
             val fragments =
                 mutableListOf(
                     PreparedProseFragment(
                         PreparedProseFragmentKind.RULE,
                         rule,
-                        color = theme.ruleColor,
-                        strokeWidth = theme.ruleThicknessPx.toFloat()
+                        color =
+                            ruleStyle?.box?.backgroundColor ?: ruleStyle?.text?.color
+                                ?: theme.ruleColor,
+                        strokeWidth = thickness.toFloat()
                     )
                 )
             val end = rule.bottom + theme.ruleMarginPx
@@ -808,7 +866,13 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
         }
 
         val availableWidth = max(1, contentWidth - listInset - quoteInset - codeInset * 2)
-        val attributed = attributed(block.inlines, paint, theme, warningSemanticGeneration)
+        val attributed = attributed(
+            block.inlines,
+            paint,
+            theme,
+            warningSemanticGeneration,
+            block.containers.map { it.nodeType } + block.nodeType
+        )
         var highlightedCodeKey: String? = null
         if (block.nodeType == "codeBlock") {
             theme.codeHighlighting?.let { config ->
@@ -1126,7 +1190,8 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
         inlines: List<ViewerInline>,
         base: PreparedTextPaint,
         theme: PreparedProseTheme,
-        warningSemanticGeneration: String
+        warningSemanticGeneration: String,
+        ancestors: List<String>
     ): AttributedBlock {
         val source = StringBuilder()
         val spans = mutableListOf<(SpannableString) -> Unit>()
@@ -1138,7 +1203,8 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                     val start = source.length
                     source.append(inline.text)
                     val end = source.length
-                    val markSpans = markSpans(inline.marks, base, theme, warningSemanticGeneration)
+                    val markSpans =
+                        markSpans(inline.marks, base, theme, warningSemanticGeneration, ancestors)
                     spans +=
                         { value ->
                             markSpans.forEach {
@@ -1169,7 +1235,13 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                         source.append('\n')
                     } else {
                         val appearance =
-                            atomAppearance(inline.nodeType, inline.attrsJson, base, theme)
+                            atomAppearance(
+                                inline.nodeType,
+                                inline.attrsJson,
+                                base,
+                                theme,
+                                ancestors
+                            )
                         val label = inline.label.ifEmpty { " " }
                         val labelPaint = appearance.paint.newTextPaint()
                         val atomInset =
@@ -1292,7 +1364,8 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
         marks: List<uniffi.editor_core.FfiViewerMark>,
         base: PreparedTextPaint,
         theme: PreparedProseTheme,
-        warningSemanticGeneration: String
+        warningSemanticGeneration: String,
+        ancestors: List<String>
     ): List<Any> {
         theme.sourceTheme?.styleSheet?.let { sheet ->
             var resolved = base.resolvedStyle ?: EditorTextStyle()
@@ -1304,7 +1377,7 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                 resolved =
                     resolved.mergedWith(
                         com.apollohg.editor.semanticText(it)
-                    ).mergedWith(sheet[it]?.text)
+                    ).mergedWith(sheet.resolveElement(it, ancestors)?.text)
             }
             marks.forEach { mark ->
                 val attrs = runCatching { org.json.JSONObject(mark.attrsJson) }.getOrNull()
@@ -1491,16 +1564,34 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
             .build()
     }
 
+    private fun markerAncestors(block: ViewerBlock, nestingDepth: Int): List<String> {
+        val chain = block.containers.map { it.nodeType }
+        val item = chain.indices.filter {
+            com.apollohg.editor.canonicalElement(chain[it]) in
+                listOf("listItem", "taskItem")
+        }.getOrNull(nestingDepth)
+        return item?.let { chain.take(it + 1) } ?: chain
+    }
+
     private fun markerFor(
         context: ViewerListContext,
         nestingDepth: Int,
         textPaint: PreparedTextPaint,
-        theme: PreparedProseTheme
+        theme: PreparedProseTheme,
+        ancestors: List<String>
     ): PreparedMarker {
+        val style = theme.sourceTheme?.styleSheet?.resolveElement("listMarker", ancestors)
+        val theme = theme.copy(
+            listMarkerColor = style?.text?.color ?: theme.listMarkerColor,
+            listMarkerScale = style?.scale ?: theme.listMarkerScale,
+            orderedListMarker = style?.ordered ?: theme.orderedListMarker
+        )
+        val gap = style?.gap?.times(theme.density)?.toInt()
         if (context.kind == "task" && theme.sourceTheme?.styleSheet != null) {
             val checkbox = com.apollohg.editor.resolvedCheckboxStyle(
                 theme.sourceTheme.styleSheet,
-                context.checked
+                context.checked,
+                ancestors
             )
             val side = ((checkbox.size ?: 18f) * theme.density).toInt()
             return PreparedMarker(
@@ -1511,7 +1602,9 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                 side / 2,
                 0,
                 context.checked,
-                checkbox.copy(box = checkbox.box.scaled(theme.density))
+                checkbox.copy(box = checkbox.box.scaled(theme.density)),
+                theme.listMarkerColor,
+                gap
             )
         }
         val label = when {
@@ -1542,7 +1635,11 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                 markerPaint.newTextPaint().fontMetricsInt.descent -
                     markerPaint.newTextPaint().fontMetricsInt.ascent
             )
-            return PreparedMarker(null, label, side, side, side / 2, 0, context.checked)
+            return PreparedMarker(
+                null, label, side, side, side / 2, 0, context.checked,
+                color = theme.listMarkerColor,
+                gapPx = gap
+            )
         }
         val text = markerPaint.newTextPaint()
         val layout =
@@ -1561,7 +1658,9 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
             ink.heightPx,
             ink.ascentPx,
             layout.getLineBaseline(0),
-            context.checked
+            context.checked,
+            color = theme.listMarkerColor,
+            gapPx = gap
         )
     }
 
@@ -1587,7 +1686,7 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
             marker.layout,
             x,
             layoutY,
-            color = color,
+            color = marker.color ?: color,
             label = marker.label,
             checked = marker.checked,
             box = marker.checkbox?.box,
@@ -1599,7 +1698,8 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
         nodeType: String,
         attrsJson: String,
         base: PreparedTextPaint,
-        theme: PreparedProseTheme
+        theme: PreparedProseTheme,
+        ancestors: List<String>
     ): PreparedAtomAppearance {
         if (nodeType == "mention") {
             val values = runCatching { org.json.JSONObject(attrsJson) }.getOrNull()
@@ -1608,7 +1708,8 @@ internal class StaticLayoutAndroidProseLayoutEngine : AndroidProseLayoutEngine {
                 val element = com.apollohg.editor.resolvedMentionStyle(
                     base.resolvedStyle ?: EditorTextStyle(),
                     theme.sourceTheme,
-                    local
+                    local,
+                    ancestors
                 )
                 val box = element.box.scaled(theme.density)
                 return PreparedAtomAppearance(

package/dist/EditorStyleSheetNormalization.js

@@ -249,6 +249,43 @@ function normalizeEditorTheme(theme) {
     const styles = {};
     const result = { version: 1 };
     for (const [key, value] of Object.entries(theme)) {
+        if (key === 'rules') {
+            if (value === undefined) {
+                continue;
+            }
+            if (!Array.isArray(value)) {
+                invalid('rules', 'expected an array');
+            }
+            result.rules = value.map((entry, index) => {
+                const indexedPath = `rules[${index}]`;
+                if (!record(entry)) {
+                    invalid(indexedPath, 'expected a rule object');
+                }
+                for (const propertyName of Object.keys(entry)) {
+                    if (propertyName !== 'path' && propertyName !== 'style') {
+                        invalid(`${indexedPath}.${propertyName}`, 'unsupported property');
+                    }
+                }
+                if (!Array.isArray(entry.path) || entry.path.length === 0) {
+                    invalid(`${indexedPath}.path`, 'expected a nonempty array');
+                }
+                entry.path.forEach((element, pathIndex) => {
+                    if (typeof element !== 'string' ||
+                        !Object.prototype.hasOwnProperty.call(fields, element)) {
+                        invalid(`${indexedPath}.path[${pathIndex}]`, 'unsupported element');
+                    }
+                });
+                if (!Object.prototype.hasOwnProperty.call(entry, 'style')) {
+                    invalid(`${indexedPath}.style`, 'expected an own style property');
+                }
+                const target = entry.path[entry.path.length - 1];
+                return {
+                    path: [...entry.path],
+                    style: normalizeStyle(entry.style, fields[target], `${indexedPath}.style`),
+                };
+            });
+            continue;
+        }
         if (key === 'toolbar') {
             if (value !== undefined) {
                 if (!record(value)) {

package/dist/EditorStyleSheetTypes.d.ts

@@ -123,9 +123,16 @@ export interface EditorStyleMap {
     mention: EditorMentionStyle;
     placeholder: EditorTypographyStyle;
 }
+export type EditorStyleRule = {
+    [K in keyof EditorStyleMap]: {
+        path: readonly [...(keyof EditorStyleMap)[], K];
+        style: EditorStyleProp<EditorStyleMap[K]>;
+    };
+}[keyof EditorStyleMap];
 export type EditorTheme = {
     [K in keyof EditorStyleMap]?: EditorStyleProp<EditorStyleMap[K]>;
 } & {
+    rules?: readonly EditorStyleRule[];
     toolbar?: EditorToolbarTheme;
 };
 export type EditorLinkTheme = EditorInlineStyle;
@@ -138,6 +145,10 @@ export type NormalizedEditorStyle = Readonly<Record<string, unknown>>;
 export interface NormalizedEditorTheme {
     version: 1;
     styles?: Partial<Record<keyof EditorStyleMap, NormalizedEditorStyle>>;
+    rules?: readonly {
+        path: readonly (keyof EditorStyleMap)[];
+        style: NormalizedEditorStyle;
+    }[];
     toolbar?: EditorToolbarTheme;
 }
 type ExactStyle<T, Shape> = T extends false | null | undefined ? T : T extends readonly unknown[] ? {
@@ -145,7 +156,17 @@ type ExactStyle<T, Shape> = T extends false | null | undefined ? T : T extends r
 } : Shape & {
     [K in keyof T]: K extends keyof Shape ? K extends 'checked' ? ExactStyle<T[K], EditorCheckboxAppearance> : K extends 'ordered' ? ExactStyle<T[K], EditorOrderedListMarkerTheme> : Shape[K] : never;
 };
+type ExactRuleStyle<T, Shape> = [EditorStyleProp<Shape>] extends [T] ? [T] extends [EditorStyleProp<Shape>] ? T : ExactStyle<T, Shape> : ExactStyle<T, Shape>;
+type ExactEditorStyleRule<T> = T extends {
+    readonly path: infer Path extends readonly (keyof EditorStyleMap)[];
+    readonly style: unknown;
+} ? Path extends readonly [...(keyof EditorStyleMap)[], infer Target] ? Target extends keyof EditorStyleMap ? {
+    [K in keyof T]: K extends 'path' ? Path : K extends 'style' ? ExactRuleStyle<T[K], EditorStyleMap[Target]> : never;
+} : never : never : never;
+type ExactEditorStyleRules<T> = T extends undefined ? T : T extends readonly unknown[] ? {
+    [K in keyof T]: ExactEditorStyleRule<T[K]>;
+} : never;
 export type ExactEditorTheme<T> = {
-    [K in keyof T]: K extends keyof EditorStyleMap ? ExactStyle<T[K], EditorStyleMap[K]> : K extends 'toolbar' ? EditorToolbarTheme : never;
+    [K in keyof T]: K extends 'rules' ? ExactEditorStyleRules<T[K]> : K extends keyof EditorStyleMap ? ExactStyle<T[K], EditorStyleMap[K]> : K extends 'toolbar' ? EditorToolbarTheme : never;
 };
 export {};

package/dist/EditorTheme.js

@@ -27,12 +27,15 @@ function stripUndefined(value) {
  */
 function serializeEditorTheme(theme, mentionTheme) {
     const normalized = theme === undefined ? undefined : (0, EditorStyleSheetNormalization_1.normalizeEditorTheme)(theme);
-    const cleanedTheme = normalized && (normalized.styles || normalized.toolbar)
+    const cleanedTheme = normalized && (normalized.styles || normalized.rules || normalized.toolbar)
         ? stripUndefined(normalized)
         : undefined;
     const base = cleanedTheme && typeof cleanedTheme === 'object'
         ? cleanedTheme
         : undefined;
+    if (base && normalized?.rules !== undefined) {
+        base.rules = normalized.rules;
+    }
     const cleanedMentions = mentionTheme
         ? stripUndefined((0, EditorMentionThemeNormalization_1.normalizeEditorMentionTheme)(mentionTheme))
         : undefined;

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { EditorToolbar, DEFAULT_EDITOR_TOOLBAR_ITEMS, type EditorToolbarProps, t
 export type { EditorContentInsets, EditorTheme, EditorTextStyle, EditorLinkTheme, EditorHeadingTheme, EditorListTheme, EditorOrderedListNumberingScheme, EditorOrderedListMarkerTheme, EditorHorizontalRuleTheme, EditorBlockquoteTheme, EditorCodeBlockTheme, EditorMentionTheme, EditorMentionNodeTheme, EditorMentionSuggestionsTheme, EditorMentionSuggestionOptionTheme, EditorToolbarTheme, EditorToolbarAppearance, EditorFontStyle, EditorFontWeight, } from './EditorTheme';
 export { serializeEditorTheme } from './EditorTheme';
 export { EditorStyleSheet } from './EditorStyleSheet';
-export type { EditorStyleProp, EditorStyleMap, EditorTypographyStyle, EditorBorderStyle, EditorPaddingStyle, EditorMarginStyle, EditorSurfaceStyle, EditorBoxStyle, EditorInlineStyle, EditorImageStyle, EditorListStyle, EditorListMarkerStyle, EditorCheckboxAppearance, EditorTaskCheckboxStyle, EditorHorizontalRuleStyle, EditorMentionStyle, } from './EditorStyleSheetTypes';
+export type { EditorStyleProp, EditorStyleRule, EditorStyleMap, EditorTypographyStyle, EditorBorderStyle, EditorPaddingStyle, EditorMarginStyle, EditorSurfaceStyle, EditorBoxStyle, EditorInlineStyle, EditorImageStyle, EditorListStyle, EditorListMarkerStyle, EditorCheckboxAppearance, EditorTaskCheckboxStyle, EditorHorizontalRuleStyle, EditorMentionStyle, } from './EditorStyleSheetTypes';
 export { createMentionsAddon, type EditorAddon, type EditorAddonEntry, type MentionsAddon, type MentionsAddonOptions, type MentionPressEvent, type CodeHighlightingAddon, type CodeHighlightingAddonOptions, } from './EditorAddon';
 export { MENTION_NODE_NAME, mentionNodeSpec, withMentionsSchema, buildMentionFragmentJson, type EditorAddons, type MentionsAddonConfig, type MentionSuggestion, type MentionQueryChangeEvent, type MentionFragmentOptions, type MentionSelectionAttrsEvent, type MentionThemeResolveEvent, type MentionSelectEvent, type EditorAddonEvent, } from './addons';
 export { defineAtomNode, withAtomsSchema, serializeEditorAtoms, type AtomAttrsUpdate, type AtomEditorActions, type InferAtomAttrs, type AtomComponent, type AtomComponentProps, type AtomNodeConfig, type AtomNodeDefinition, type SerializedEditorAtoms, } from './atoms';

package/dist/useRichTextEditorCommands.js

@@ -190,13 +190,8 @@ function useRichTextEditorCommands(context) {
             return;
         }
         applyEngineCommand({
-            type: 'wrapInList',
+            type: 'applyListType',
             listType,
-            itemType: listType === 'taskList'
-                ? 'taskItem'
-                : listType === 'bullet_list' || listType === 'ordered_list'
-                    ? 'list_item'
-                    : 'listItem',
         });
     }, [activeStateRef, applyEngineCommand]);
     const commandIndentListItem = (0, react_1.useCallback)(() => applyEngineCommand({ type: 'indentListItem' }), [applyEngineCommand]);

package/ios/EditorCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<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>
 		<dict>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/EditorCore.xcframework/ios-arm64/libeditor_core.a

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/ios/EditorCore.xcframework/ios-arm64/libeditor_core.a
-size: 33938416 bytes
-sha256: 9701cff9f1597268a85581ed491f12785d9084efc30cca999c26d33fda3eea42
+size: 33937224 bytes
+sha256: 932bff445a503ec5a28a4d75e1273280144e7112315aa22799a871730bc655f2

package/ios/EditorCore.xcframework/ios-arm64_x86_64-simulator/libeditor_core.a

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/ios/EditorCore.xcframework/ios-arm64_x86_64-simulator/libeditor_core.a
-size: 67218432 bytes
-sha256: d4c1b1e920a953feb892fbd621009162112b4a1786d7ed8e58a0bc8228f3a265
+size: 67220840 bytes
+sha256: 623edc61d1273935a1d1afc314a13fd89f7cce5724ae28f96adc6d8df0b0f718

package/ios/EditorLayoutManager.swift

@@ -503,7 +503,7 @@ final class EditorLayoutManager: NSLayoutManager, NSLayoutManagerDelegate {
 
         if ordered {
             let markerFont = attrs[editorStyledContentAttribute] != nil
-                ? baseFont.withSize(baseFont.pointSize * markerScale)
+                ? baseFont
                 : markerFont(for: listContext, baseFont: baseFont, markerScale: markerScale)
             let markerText = attrs[RenderBridgeAttributes.orderedListMarkerLabel] as? String
                 ?? RenderBridge.listMarkerString(listContext: listContext)
@@ -878,9 +878,7 @@ final class EditorLayoutManager: NSLayoutManager, NSLayoutManagerDelegate {
         origin: CGPoint,
         markerGap: CGFloat = LayoutConstants.listMarkerTextGap
     ) -> CGRect {
-        let markerFont = baseFont.withSize(baseFont.pointSize * markerScale)
-        let bulletBounds = unorderedBulletGlyphBounds(for: markerFont)
-        let bulletDiameter = max(max(bulletBounds.width, bulletBounds.height), 1)
+        let bulletDiameter = max(baseFont.pointSize * markerScale * 0.32, 4)
         let targetCenterAboveBaseline = (baseFont.xHeight > 0 ? baseFont.xHeight : baseFont.capHeight) / 2.0
         let centerY = baselineY - targetCenterAboveBaseline
         let referenceRect = usedRect.height > 0 ? usedRect : lineFragmentRect