@codemirror/fold - npm Package Compare versions

Comparing version 0.17.1 to 0.18.0

CHANGELOG.md

@@ -0,1 +1,7 @@
+## 0.18.0 (2021-03-03)
+
+### Bug fixes
+
+Adds a screen reader announcement when code is folded or unfolded.
+
 ## 0.17.1 (2021-01-06)
@@ -2,0 +8,0 @@

dist/index.js

 import { StateEffect, StateField, Facet, combineConfig } from '@codemirror/state';
-import { Decoration, EditorView, WidgetType, themeClass, ViewPlugin } from '@codemirror/view';
+import { Decoration, EditorView, WidgetType, ViewPlugin } from '@codemirror/view';
 import { foldable } from '@codemirror/language';
@@ -57,3 +57,3 @@ import { gutter, GutterMarker } from '@codemirror/gutter';
         if (!found || found.from > from)
-            found = ({ from, to });
+            found = { from, to };
     });
@@ -68,4 +68,4 @@ return found;
 }
-function maybeEnable(state) {
-    return state.field(foldState, false) ? undefined : { append: codeFolding() };
+function maybeEnable(state, other) {
+    return state.field(foldState, false) ? other : other.concat(StateEffect.appendConfig.of(codeFolding()));
 }
@@ -77,4 +77,3 @@ /// Fold the lines that are selected, if possible.
         if (range) {
-            view.dispatch({ effects: foldEffect.of(range),
-                reconfigure: maybeEnable(view.state) });
+            view.dispatch({ effects: maybeEnable(view.state, [foldEffect.of(range), announceFold(view, range)]) });
             return true;
@@ -93,3 +92,3 @@ }
         if (folded)
-            effects.push(unfoldEffect.of(folded));
+            effects.push(unfoldEffect.of(folded), announceFold(view, folded, false));
     }
@@ -100,2 +99,6 @@ if (effects.length)
 };
+function announceFold(view, range, fold = true) {
+    let lineFrom = view.state.doc.lineAt(range.from).number, lineTo = view.state.doc.lineAt(range.to).number;
+    return EditorView.announce.of(`${view.state.phrase(fold ? "Folded lines" : "Unfolded lines")} ${lineFrom} ${view.state.phrase("to")} ${lineTo}.`);
+}
 /// Fold all top-level foldable ranges.
@@ -111,3 +114,3 @@ const foldAll = view => {
     if (effects.length)
-        view.dispatch({ effects, reconfigure: maybeEnable(view.state) });
+        view.dispatch({ effects: maybeEnable(view.state, effects) });
     return !!effects.length;
@@ -161,3 +164,3 @@ };
             element.title = state.phrase("unfold");
-            element.className = themeClass("foldPlaceholder");
+            element.className = "cm-foldPlaceholder";
             element.onclick = event => {
@@ -236,3 +239,3 @@ let line = view.visualLineAt(view.posAtDOM(event.target));
         gutter({
-            style: "foldGutter",
+            class: "cm-foldGutter",
             markers(view) { var _a; return ((_a = view.plugin(markers)) === null || _a === void 0 ? void 0 : _a.markers) || RangeSet.empty; },
@@ -262,3 +265,3 @@ initialSpacer() {
 const baseTheme = EditorView.baseTheme({
-    $foldPlaceholder: {
+    ".cm-foldPlaceholder": {
         backgroundColor: "#eee",
@@ -272,3 +275,3 @@ border: "1px solid #ddd",
     },
-    "$gutterElement.foldGutter": {
+    ".cm-foldGutter .cm-gutterElement": {
         padding: "0 1px",
@@ -275,0 +278,0 @@ cursor: "pointer"

package.json

 {
   "name": "@codemirror/fold",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "Code folding for the CodeMirror code editor",
@@ -29,7 +29,7 @@ "scripts": {
   "dependencies": {
-    "@codemirror/gutter": "^0.17.0",
-    "@codemirror/language": "^0.17.0",
-    "@codemirror/rangeset": "^0.17.0",
-    "@codemirror/state": "^0.17.0",
-    "@codemirror/view": "^0.17.0"
+    "@codemirror/gutter": "^0.18.0",
+    "@codemirror/language": "^0.18.0",
+    "@codemirror/rangeset": "^0.18.0",
+    "@codemirror/state": "^0.18.0",
+    "@codemirror/view": "^0.18.0"
   },
@@ -36,0 +36,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

50224

increased by3.81%

Lines of code

585

increased by1.04%

Dependency changes

• + Added@codemirror/gutter@0.18.4(transitive)

• + Added@codemirror/language@0.18.2(transitive)

• + Added@codemirror/rangeset@0.18.5(transitive)

• + Added@codemirror/state@0.18.7(transitive)

• + Added@codemirror/text@0.18.1(transitive)

• + Added@codemirror/view@0.18.19(transitive)

• + Addedstyle-mod@4.1.2(transitive)

• - Removed@codemirror/gutter@0.17.2(transitive)

• - Removed@codemirror/language@0.17.5(transitive)

• - Removed@codemirror/rangeset@0.17.1(transitive)

• - Removed@codemirror/state@0.17.2(transitive)

• - Removed@codemirror/text@0.17.2(transitive)

• - Removed@codemirror/view@0.17.13(transitive)

• - Removedstyle-mod@3.2.2(transitive)

• Updated@codemirror/gutter@^0.18.0

• Updated@codemirror/language@^0.18.0

• Updated@codemirror/rangeset@^0.18.0

• Updated@codemirror/state@^0.18.0

• Updated@codemirror/view@^0.18.0