@codemirror/view 6.36.5 → 6.36.7

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.36.7 (2025-05-02)
+
+### Bug fixes
+
+Use the `aria-placeholder` attribute to communicate the placeholder text to screen readers.
+
+Fix a crash when `EditorView.composing` or `.compositionStarted` are accessed during view initialization.
+
+## 6.36.6 (2025-04-24)
+
+### Bug fixes
+
+Fix an issue where `drawSelection` would draw selections starting at a block widget not at a line break in an odd way.
+
+Fix an issue where the editor would inappropriately scroll when editing near the bottom of the document with line wrapping enabled, in some cases.
+
+Fix an issue that caused unnecessary transactions on focus change.
+
 ## 6.36.5 (2025-03-29)
 
 ### Bug fixes

package/dist/index.cjs

@@ -3660,17 +3660,26 @@ function isSuspiciousChromeCaretResult(node, offset, x) {
         : textRange(node, 0, Math.max(node.nodeValue.length, 1)).getBoundingClientRect();
     return x - rect.left > 5;
 }
-function blockAt(view, pos) {
+function blockAt(view, pos, side) {
     let line = view.lineBlockAt(pos);
-    if (Array.isArray(line.type))
+    if (Array.isArray(line.type)) {
+        let best;
         for (let l of line.type) {
-            if (l.to > pos || l.to == pos && (l.to == line.to || l.type == exports.BlockType.Text))
+            if (l.from > pos)
+                break;
+            if (l.to < pos)
+                continue;
+            if (l.from < pos && l.to > pos)
                 return l;
+            if (!best || (l.type == exports.BlockType.Text && (best.type != l.type || (side < 0 ? l.from < pos : l.to > pos))))
+                best = l;
         }
+        return best || line;
+    }
     return line;
 }
 function moveToLineBoundary(view, start, forward, includeWrap) {
-    let line = blockAt(view, start.head);
+    let line = blockAt(view, start.head, start.assoc || -1);
     let coords = !includeWrap || line.type != exports.BlockType.Text || !(view.lineWrapping || line.widgetLineBreaks) ? null
         : view.coordsAtPos(start.assoc < 0 && start.head > line.from ? start.head - 1 : start.head);
     if (coords) {
@@ -4905,7 +4914,7 @@ function focusChangeTransaction(state, focus) {
         if (effect)
             effects.push(effect);
     }
-    return effects ? state.update({ effects, annotations: isFocusChange.of(true) }) : null;
+    return effects.length ? state.update({ effects, annotations: isFocusChange.of(true) }) : null;
 }
 function updateForFocusChange(view) {
     setTimeout(() => {
@@ -5941,7 +5950,7 @@ class ViewState {
         }
         else {
             this.scrollAnchorPos = -1;
-            this.scrollAnchorHeight = this.heightMap.height;
+            this.scrollAnchorHeight = prevHeight;
         }
         let viewport = heightChanges.length ? this.mapViewport(this.viewport, update.changes) : this.viewport;
         if (scrollTarget && (scrollTarget.range.head < viewport.from || scrollTarget.range.head > viewport.to) ||
@@ -7437,14 +7446,14 @@ class EditorView {
     [IME](https://en.wikipedia.org/wiki/Input_method), and at least
     one change has been made in the current composition.
     */
-    get composing() { return this.inputState.composing > 0; }
+    get composing() { return !!this.inputState && this.inputState.composing > 0; }
     /**
     Indicates whether the user is currently in composing state. Note
     that on some platforms, like Android, this will be the case a
     lot, since just putting the cursor on a word starts a
     composition there.
     */
-    get compositionStarted() { return this.inputState.composing >= 0; }
+    get compositionStarted() { return !!this.inputState && this.inputState.composing >= 0; }
     /**
     The document or shadow root that the view lives in.
     */
@@ -8871,7 +8880,7 @@ function rectanglesForRange(view, className, range) {
     let leftSide = contentRect.left +
         (lineStyle ? parseInt(lineStyle.paddingLeft) + Math.min(0, parseInt(lineStyle.textIndent)) : 0);
     let rightSide = contentRect.right - (lineStyle ? parseInt(lineStyle.paddingRight) : 0);
-    let startBlock = blockAt(view, from), endBlock = blockAt(view, to);
+    let startBlock = blockAt(view, from, 1), endBlock = blockAt(view, to, -1);
     let visualStart = startBlock.type == exports.BlockType.Text ? startBlock : null;
     let visualEnd = endBlock.type == exports.BlockType.Text ? endBlock : null;
     if (visualStart && (view.lineWrapping || startBlock.widgetLineBreaks))
@@ -9585,10 +9594,7 @@ class Placeholder extends WidgetType {
         wrap.appendChild(typeof this.content == "string" ? document.createTextNode(this.content) :
             typeof this.content == "function" ? this.content(view) :
                 this.content.cloneNode(true));
-        if (typeof this.content == "string")
-            wrap.setAttribute("aria-label", "placeholder " + this.content);
-        else
-            wrap.setAttribute("aria-hidden", "true");
+        wrap.setAttribute("aria-hidden", "true");
         return wrap;
     }
     coordsAt(dom) {
@@ -9609,7 +9615,7 @@ Extension that enables a placeholder—a piece of example content
 to show when the editor is empty.
 */
 function placeholder(content) {
-    return ViewPlugin.fromClass(class {
+    let plugin = ViewPlugin.fromClass(class {
         constructor(view) {
             this.view = view;
             this.placeholder = content
@@ -9618,6 +9624,9 @@ function placeholder(content) {
         }
         get decorations() { return this.view.state.doc.length ? Decoration.none : this.placeholder; }
     }, { decorations: v => v.decorations });
+    return typeof content == "string" ? [
+        plugin, EditorView.contentAttributes.of({ "aria-placeholder": content })
+    ] : plugin;
 }
 
 // Don't compute precise column positions for line offsets above this

package/dist/index.js

@@ -3656,17 +3656,26 @@ function isSuspiciousChromeCaretResult(node, offset, x) {
         : textRange(node, 0, Math.max(node.nodeValue.length, 1)).getBoundingClientRect();
     return x - rect.left > 5;
 }
-function blockAt(view, pos) {
+function blockAt(view, pos, side) {
     let line = view.lineBlockAt(pos);
-    if (Array.isArray(line.type))
+    if (Array.isArray(line.type)) {
+        let best;
         for (let l of line.type) {
-            if (l.to > pos || l.to == pos && (l.to == line.to || l.type == BlockType.Text))
+            if (l.from > pos)
+                break;
+            if (l.to < pos)
+                continue;
+            if (l.from < pos && l.to > pos)
                 return l;
+            if (!best || (l.type == BlockType.Text && (best.type != l.type || (side < 0 ? l.from < pos : l.to > pos))))
+                best = l;
         }
+        return best || line;
+    }
     return line;
 }
 function moveToLineBoundary(view, start, forward, includeWrap) {
-    let line = blockAt(view, start.head);
+    let line = blockAt(view, start.head, start.assoc || -1);
     let coords = !includeWrap || line.type != BlockType.Text || !(view.lineWrapping || line.widgetLineBreaks) ? null
         : view.coordsAtPos(start.assoc < 0 && start.head > line.from ? start.head - 1 : start.head);
     if (coords) {
@@ -4901,7 +4910,7 @@ function focusChangeTransaction(state, focus) {
         if (effect)
             effects.push(effect);
     }
-    return effects ? state.update({ effects, annotations: isFocusChange.of(true) }) : null;
+    return effects.length ? state.update({ effects, annotations: isFocusChange.of(true) }) : null;
 }
 function updateForFocusChange(view) {
     setTimeout(() => {
@@ -5936,7 +5945,7 @@ class ViewState {
         }
         else {
             this.scrollAnchorPos = -1;
-            this.scrollAnchorHeight = this.heightMap.height;
+            this.scrollAnchorHeight = prevHeight;
         }
         let viewport = heightChanges.length ? this.mapViewport(this.viewport, update.changes) : this.viewport;
         if (scrollTarget && (scrollTarget.range.head < viewport.from || scrollTarget.range.head > viewport.to) ||
@@ -7432,14 +7441,14 @@ class EditorView {
     [IME](https://en.wikipedia.org/wiki/Input_method), and at least
     one change has been made in the current composition.
     */
-    get composing() { return this.inputState.composing > 0; }
+    get composing() { return !!this.inputState && this.inputState.composing > 0; }
     /**
     Indicates whether the user is currently in composing state. Note
     that on some platforms, like Android, this will be the case a
     lot, since just putting the cursor on a word starts a
     composition there.
     */
-    get compositionStarted() { return this.inputState.composing >= 0; }
+    get compositionStarted() { return !!this.inputState && this.inputState.composing >= 0; }
     /**
     The document or shadow root that the view lives in.
     */
@@ -8866,7 +8875,7 @@ function rectanglesForRange(view, className, range) {
     let leftSide = contentRect.left +
         (lineStyle ? parseInt(lineStyle.paddingLeft) + Math.min(0, parseInt(lineStyle.textIndent)) : 0);
     let rightSide = contentRect.right - (lineStyle ? parseInt(lineStyle.paddingRight) : 0);
-    let startBlock = blockAt(view, from), endBlock = blockAt(view, to);
+    let startBlock = blockAt(view, from, 1), endBlock = blockAt(view, to, -1);
     let visualStart = startBlock.type == BlockType.Text ? startBlock : null;
     let visualEnd = endBlock.type == BlockType.Text ? endBlock : null;
     if (visualStart && (view.lineWrapping || startBlock.widgetLineBreaks))
@@ -9580,10 +9589,7 @@ class Placeholder extends WidgetType {
         wrap.appendChild(typeof this.content == "string" ? document.createTextNode(this.content) :
             typeof this.content == "function" ? this.content(view) :
                 this.content.cloneNode(true));
-        if (typeof this.content == "string")
-            wrap.setAttribute("aria-label", "placeholder " + this.content);
-        else
-            wrap.setAttribute("aria-hidden", "true");
+        wrap.setAttribute("aria-hidden", "true");
         return wrap;
     }
     coordsAt(dom) {
@@ -9604,7 +9610,7 @@ Extension that enables a placeholder—a piece of example content
 to show when the editor is empty.
 */
 function placeholder(content) {
-    return ViewPlugin.fromClass(class {
+    let plugin = ViewPlugin.fromClass(class {
         constructor(view) {
             this.view = view;
             this.placeholder = content
@@ -9613,6 +9619,9 @@ function placeholder(content) {
         }
         get decorations() { return this.view.state.doc.length ? Decoration.none : this.placeholder; }
     }, { decorations: v => v.decorations });
+    return typeof content == "string" ? [
+        plugin, EditorView.contentAttributes.of({ "aria-placeholder": content })
+    ] : plugin;
 }
 
 // Don't compute precise column positions for line offsets above this

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/view",
-  "version": "6.36.5",
+  "version": "6.36.7",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",

package/tdrawlog.txt

@@ -0,0 +1,96 @@
+ 372 --- Process Attached
+ 372 --- lmap success
+ 372 --- Init TAConfig
+ 372 --- Install Limit Crack
+ 372 --- IncreaseAISearchMapEntriesLimit
+ 372 --- WriteNewLimit
+ 372 --- IncreaseCompositeBuf
+ 372 --- IncreaseSfxLimit
+ 372 --- FullScreenMinimap init
+ 372 --- DirectDrawCreate
+ 372 --- IDDraw Created
+ 372 --- returning from DirectDrawCreate
+ 372 --- SetCooperativeLevel
+ 372 --- SetCooperativeLevel, GUI theadid = 372
+ 372 --- SetDisplayMode
+ 372 --- CreateSurface
+ 372 --- New Dialog
+ 372 --- New AlliesWhiteboard
+ 372 --- New CIncome
+ 372 --- New CTAHook
+ 372 --- New CWarp
+ 372 --- New CMapRect
+ 372 --- New CChangeQueue
+ 372 --- New CMinimapHandler
+ 372 --- IDDrawSurface Created
+ 372 --- GetAttachedSurface
+ 372 --- CreateClipper
+ 372 --- SetClipper
+ 372 --- CreatePalette
+ 372 --- SetPalette
+ 372 --- New ExternQuickKey
+ 372 --- Blt
+ 404 --- MegamapTAStuff
+ 404 --- UnitsMap Surface Init
+ 372 --- IsLost
+ 372 --- [DDrawSurface::Release] ...
+ 372 --- DDRAW::Release
+ 372 --- DirectDrawCreate
+ 372 --- IDDraw Created
+ 372 --- returning from DirectDrawCreate
+ 372 --- SetCooperativeLevel
+ 372 --- SetCooperativeLevel, GUI theadid = 372
+ 372 --- SetDisplayMode
+ 372 --- CreateSurface
+ 372 --- New Dialog
+ 372 --- New AlliesWhiteboard
+ 372 --- New CIncome
+ 372 --- New CTAHook
+ 372 --- New CWarp
+ 372 --- New CMapRect
+ 372 --- New CChangeQueue
+ 372 --- New CMinimapHandler
+ 372 --- UnitsMap Surface Init
+ 372 --- IDDrawSurface Created
+ 372 --- GetAttachedSurface
+ 372 --- CreateClipper
+ 372 --- SetClipper
+ 372 --- CreatePalette
+ 372 --- SetPalette
+ 372 --- [WindSpeedSyncProc] initialsing RNG using current time. t=809896644
+ 372 --- InitPictureColors
+ 372 --- InitUnSelectedPictureColors
+ 372 --- InitUnSelectedPictureColors
+ 372 --- IsLost
+ 372 --- [DDrawSurface::Release] ...
+ 372 --- DDRAW::Release
+ 372 --- DirectDrawCreate
+ 372 --- IDDraw Created
+ 372 --- returning from DirectDrawCreate
+ 372 --- SetCooperativeLevel
+ 372 --- SetCooperativeLevel, GUI theadid = 372
+ 372 --- SetDisplayMode
+ 372 --- CreateSurface
+ 372 --- New Dialog
+ 372 --- New AlliesWhiteboard
+ 372 --- New CIncome
+ 372 --- New CTAHook
+ 372 --- New CWarp
+ 372 --- New CMapRect
+ 372 --- New CChangeQueue
+ 372 --- New CMinimapHandler
+ 372 --- UnitsMap Surface Init
+ 372 --- IDDrawSurface Created
+ 372 --- GetAttachedSurface
+ 372 --- CreateClipper
+ 372 --- SetClipper
+ 372 --- CreatePalette
+ 372 --- SetPalette
+ 372 --- [DDrawSurface::Release] ...
+ 372 --- DDRAW::Release
+ 372 --- Release AddtionRoutine_CircleSelect
+ 372 --- Uninstall Limit Crack
+ 372 --- Release IncreaseUnitTypeLimit
+ 372 --- Release IncreaseCompositeBuf
+ 372 --- Release IncreaseSfxLimit
+ 372 --- Release AddtionRoutine_CircleSelect