@bhsd/codemirror-mediawiki 3.9.1 → 3.9.2

package/dist/statusBar.js

@@ -3,8 +3,8 @@ import { nextDiagnostic, setDiagnosticsEffect } from '@codemirror/lint';
 import { gotoLine } from '@codemirror/search';
 import elt from 'crelt';
 import { menuRegistry } from './codemirror.js';
-import { panelSelector, diagnosticSelector, menuSelector, messageSelector, actionSelector } from './constants.js';
-const statusSelector = '.cm-panel-status', workerSelector = '.cm-status-worker', errorSelector = '.cm-status-error', warningSelector = '.cm-status-warning', enabledSelector = '.cm-status-fix-enabled', disabledSelector = '.cm-status-fix-disabled', workerCls = 'cm-status-worker-enabled', lineCls = 'cm-status-line';
+import { panelSelector, diagnosticSelector, actionSelector, bgDark } from './constants.js';
+const statusSelector = '.cm-panel-status', workerSelector = '.cm-status-worker', errorSelector = '.cm-status-error', warningSelector = '.cm-status-warning', enabledSelector = '.cm-status-fix-enabled', disabledSelector = '.cm-status-fix-disabled', menuSelector = '.cm-status-fix-menu', menuHover = `${menuSelector}>div:hover`, messageSelector = '.cm-status-message', workerCls = 'cm-status-worker-enabled', lineCls = 'cm-status-line';
 function getLintMarker(view, severity, menu) {
     const marker = elt('div', { class: `cm-status-${severity}` }), icon = elt('div');
     if (severity === 'fix') {
@@ -233,4 +233,25 @@ export default (cm, fixer) => [
             cursor: 'pointer',
         },
     }),
+    EditorView.baseTheme({
+        [`&light ${menuSelector}`]: {
+            backgroundColor: '#f5f5f5',
+            boxShadow: '0 2px 2px 0 rgb(0,0,0,.25)',
+        },
+        [`&light ${menuHover}`]: {
+            backgroundColor: '#e2f2ff',
+        },
+        [`&light ${messageSelector}`]: {
+            borderColor: '#c8ccd1',
+        },
+        [`&dark ${menuSelector}`]: {
+            backgroundColor: '#252a33',
+        },
+        [`&dark ${menuHover}`]: {
+            backgroundColor: bgDark,
+        },
+        [`&dark ${messageSelector}`]: {
+            borderColor: '#000',
+        },
+    }),
 ];

package/dist/theme.js

@@ -1,7 +1,7 @@
 import { EditorView } from '@codemirror/view';
 import { nord as nordBase } from 'cm6-theme-nord';
-import { foldSelector, hoverSelector, matchingCls, nonmatchingCls, menuSelector, messageSelector, actionSelector, panelsSelector, } from './constants.js';
-const focused = '&.cm-focused', matching = `${focused} .${matchingCls}`, nonmatching = `${focused} .${nonmatchingCls}`, code = `${hoverSelector} code`, menuHover = `${menuSelector}>div:hover`;
+import { matchingCls, nonmatchingCls, actionSelector, panelsSelector, bgDark, } from './constants.js';
+const focused = '&.cm-focused', matching = `${focused} .${matchingCls}`, nonmatching = `${focused} .${nonmatchingCls}`;
 export const light = /* @__PURE__ */ EditorView.theme({
     '&': {
         backgroundColor: '#fff',
@@ -31,19 +31,6 @@ export const light = /* @__PURE__ */ EditorView.theme({
     [nonmatching]: {
         backgroundColor: 'rgb(187,85,85,.27)',
     },
-    [code]: {
-        backgroundColor: '#e0e6eb',
-    },
-    [menuSelector]: {
-        backgroundColor: '#f5f5f5',
-        boxShadow: '0 2px 2px 0 rgb(0,0,0,.25)',
-    },
-    [menuHover]: {
-        backgroundColor: '#e2f2ff',
-    },
-    [messageSelector]: {
-        borderColor: '#c8ccd1',
-    },
 }), 
 /**
  * @author 鬼影233
@@ -84,18 +71,12 @@ nord = /* @__PURE__ */ (() => [
         [nonmatching]: {
             backgroundColor: 'rgb(235,203,139,.32)',
         },
-        [`${focused}>.cm-scroller>.cm-selectionLayer div.cm-selectionBackground, ${code}, ${menuHover}, ${actionSelector}, div${foldSelector}`]: {
-            backgroundColor: '#4c566a',
+        [`${focused}>.cm-scroller>.cm-selectionLayer div.cm-selectionBackground, ${actionSelector}`]: {
+            backgroundColor: bgDark,
         },
         [`div${panelsSelector}`]: {
             color: '#d8dee9',
         },
-        [menuSelector]: {
-            backgroundColor: '#252a33',
-        },
-        [messageSelector]: {
-            borderColor: '#000',
-        },
         [`${focused} .cm-searchMatch.cm-searchMatch-selected`]: {
             color: '#b48ead',
         },