@eccenca/gui-elements 24.1.0-rc.1 → 24.1.0-rc.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +8 -4
  2. package/dist/cjs/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js +17 -8
  3. package/dist/cjs/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js.map +1 -1
  4. package/dist/esm/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js +14 -5
  5. package/dist/esm/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js.map +1 -1
  6. package/dist/types/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.d.ts +5 -3
  7. package/package.json +5 -2
  8. package/src/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.ts +15 -5
package/CHANGELOG.md CHANGED
@@ -19,15 +19,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
19
19
  - implemented support for `disabled` state in code editor
20
20
  - implemented support for `intent` states in code editor
21
21
 
22
- ### Fixed
23
-
24
- - `MultiSelect`:
25
- - Old suggestions might be shown for a very short time when typing in a new search query.
22
+ ## [24.0.1] - 2025-02-06
26
23
 
27
24
  ### Changed
28
25
 
29
26
  - `eslint` libraries were upgraded to v9, so `node` v18.18 or higher is required
30
27
 
28
+ ### Fixed
29
+
30
+ - `MultiSelect`:
31
+ - Old suggestions might be shown for a very short time when typing in a new search query.
32
+ - `CodeEditor`:
33
+ - Broken highlighting for editor modes that leveraged adapted legacy modes.
34
+
31
35
  ## [24.0.0] - 2024-12-17
32
36
 
33
37
  This is a major release, and it might be not compatible with your current usage of our library. Please read about the necessary changes in the section about how to migrate.
package/dist/cjs/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js CHANGED
@@ -1,20 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useCodeMirrorModeExtension = exports.supportedCodeEditorModes = void 0;
4
+ //adapted v6 modes imports
5
+ const lang_javascript_1 = require("@codemirror/lang-javascript");
4
6
  const lang_json_1 = require("@codemirror/lang-json");
5
- //modes imports
6
7
  const lang_markdown_1 = require("@codemirror/lang-markdown");
8
+ const lang_sql_1 = require("@codemirror/lang-sql");
7
9
  const lang_xml_1 = require("@codemirror/lang-xml");
10
+ const lang_yaml_1 = require("@codemirror/lang-yaml");
8
11
  const language_1 = require("@codemirror/language");
9
- const javascript_1 = require("@codemirror/legacy-modes/mode/javascript");
12
+ //legacy mode imports
10
13
  const jinja2_1 = require("@codemirror/legacy-modes/mode/jinja2");
11
14
  const mathematica_1 = require("@codemirror/legacy-modes/mode/mathematica");
12
15
  const ntriples_1 = require("@codemirror/legacy-modes/mode/ntriples");
13
16
  const python_1 = require("@codemirror/legacy-modes/mode/python");
14
17
  const sparql_1 = require("@codemirror/legacy-modes/mode/sparql");
15
- const sql_1 = require("@codemirror/legacy-modes/mode/sql");
16
18
  const turtle_1 = require("@codemirror/legacy-modes/mode/turtle");
17
- const yaml_1 = require("@codemirror/legacy-modes/mode/yaml");
18
19
  //adaptations
19
20
  const codemirrorTestHelper_1 = require("../tests/codemirrorTestHelper");
20
21
  const supportedModes = {
@@ -23,19 +24,27 @@ const supportedModes = {
23
24
  sparql: sparql_1.sparql,
24
25
  turtle: turtle_1.turtle,
25
26
  xml: lang_xml_1.xml,
26
- yaml: yaml_1.yaml,
27
+ yaml: lang_yaml_1.yaml,
27
28
  jinja2: jinja2_1.jinja2,
28
29
  json: lang_json_1.json,
29
30
  ntriples: ntriples_1.ntriples,
30
31
  mathematica: mathematica_1.mathematica,
31
- sql: sql_1.sql,
32
- javascript: javascript_1.javascript,
32
+ sql: lang_sql_1.sql,
33
+ javascript: lang_javascript_1.javascript,
33
34
  };
34
35
  exports.supportedCodeEditorModes = Object.keys(supportedModes);
36
+ const v6AdaptedModes = new Map([
37
+ ["json", true],
38
+ ["markdown", true],
39
+ ["xml", true],
40
+ ["sql", true],
41
+ ["yaml", true],
42
+ ["javascript", true],
43
+ ]);
35
44
  const useCodeMirrorModeExtension = (mode) => {
36
45
  return !mode
37
46
  ? (0, codemirrorTestHelper_1.adaptedSyntaxHighlighting)(language_1.defaultHighlightStyle)
38
- : ["json", "markdown", "xml"].includes(mode)
47
+ : v6AdaptedModes.has(mode)
39
48
  ? (typeof supportedModes[mode] === "function" ? supportedModes[mode] : () => null)()
40
49
  : language_1.StreamLanguage === null || language_1.StreamLanguage === void 0 ? void 0 : language_1.StreamLanguage.define(supportedModes[mode]);
41
50
  };
package/dist/cjs/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useCodemirrorModeExtension.hooks.js","sourceRoot":"","sources":["../../../../../src/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.ts"],"names":[],"mappings":";;;AAAA,qDAA6C;AAC7C,eAAe;AACf,6DAAqD;AACrD,mDAA2C;AAC3C,mDAA4G;AAC5G,yEAAsE;AACtE,iEAA8D;AAC9D,2EAAwE;AACxE,qEAAkE;AAClE,iEAA8D;AAC9D,iEAA8D;AAC9D,2DAAwD;AACxD,iEAA8D;AAC9D,6DAA0D;AAE1D,aAAa;AACb,wEAA0E;AAE1E,MAAM,cAAc,GAAG;IACnB,QAAQ,EAAR,wBAAQ;IACR,MAAM,EAAN,eAAM;IACN,MAAM,EAAN,eAAM;IACN,MAAM,EAAN,eAAM;IACN,GAAG,EAAH,cAAG;IACH,IAAI,EAAJ,WAAI;IACJ,MAAM,EAAN,eAAM;IACN,IAAI,EAAJ,gBAAI;IACJ,QAAQ,EAAR,mBAAQ;IACR,WAAW,EAAX,yBAAW;IACX,GAAG,EAAH,SAAG;IACH,UAAU,EAAV,uBAAU;CACJ,CAAC;AAEE,QAAA,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAuC,CAAC;AAGnG,MAAM,0BAA0B,GAAG,CAAC,IAA+B,EAAE,EAAE;IAC1E,OAAO,CAAC,IAAI;QACR,CAAC,CAAC,IAAA,gDAAyB,EAAC,gCAAqB,CAAC;QAClD,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAE,CAAC,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAA2B,EAAE;YAC/G,CAAC,CAAC,yBAAc,aAAd,yBAAc,uBAAd,yBAAc,CAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAA0B,CAAC,CAAC;AAChF,CAAC,CAAC;AANW,QAAA,0BAA0B,8BAMrC"}
1
+ {"version":3,"file":"useCodemirrorModeExtension.hooks.js","sourceRoot":"","sources":["../../../../../src/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.ts"],"names":[],"mappings":";;;AAAA,0BAA0B;AAC1B,iEAAyD;AACzD,qDAA6C;AAC7C,6DAAqD;AACrD,mDAA2C;AAC3C,mDAA2C;AAC3C,qDAA6C;AAC7C,mDAA4G;AAC5G,qBAAqB;AACrB,iEAA8D;AAC9D,2EAAwE;AACxE,qEAAkE;AAClE,iEAA8D;AAC9D,iEAA8D;AAC9D,iEAA8D;AAE9D,aAAa;AACb,wEAA0E;AAE1E,MAAM,cAAc,GAAG;IACnB,QAAQ,EAAR,wBAAQ;IACR,MAAM,EAAN,eAAM;IACN,MAAM,EAAN,eAAM;IACN,MAAM,EAAN,eAAM;IACN,GAAG,EAAH,cAAG;IACH,IAAI,EAAJ,gBAAI;IACJ,MAAM,EAAN,eAAM;IACN,IAAI,EAAJ,gBAAI;IACJ,QAAQ,EAAR,mBAAQ;IACR,WAAW,EAAX,yBAAW;IACX,GAAG,EAAH,cAAG;IACH,UAAU,EAAV,4BAAU;CACJ,CAAC;AAEE,QAAA,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAuC,CAAC;AAG1G,MAAM,cAAc,GAAmD,IAAI,GAAG,CAAC;IAC3E,CAAC,MAAM,EAAE,IAAI,CAAC;IACd,CAAC,UAAU,EAAE,IAAI,CAAC;IAClB,CAAC,KAAK,EAAE,IAAI,CAAC;IACb,CAAC,KAAK,EAAE,IAAI,CAAC;IACb,CAAC,MAAM,EAAE,IAAI,CAAC;IACd,CAAC,YAAY,EAAE,IAAI,CAAC;CACvB,CAAC,CAAC;AAEI,MAAM,0BAA0B,GAAG,CAAC,IAA+B,EAAE,EAAE;IAC1E,OAAO,CAAC,IAAI;QACR,CAAC,CAAC,IAAA,gDAAyB,EAAC,gCAAqB,CAAC;QAClD,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC;YAC1B,CAAC,CAAE,CAAC,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAA2B,EAAE;YAC/G,CAAC,CAAC,yBAAc,aAAd,yBAAc,uBAAd,yBAAc,CAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAA0B,CAAC,CAAC;AAChF,CAAC,CAAC;AANW,QAAA,0BAA0B,8BAMrC"}
package/dist/esm/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js CHANGED
@@ -1,17 +1,18 @@
1
+ //adapted v6 modes imports
2
+ import { javascript } from "@codemirror/lang-javascript";
1
3
  import { json } from "@codemirror/lang-json";
2
- //modes imports
3
4
  import { markdown } from "@codemirror/lang-markdown";
5
+ import { sql } from "@codemirror/lang-sql";
4
6
  import { xml } from "@codemirror/lang-xml";
7
+ import { yaml } from "@codemirror/lang-yaml";
5
8
  import { defaultHighlightStyle, StreamLanguage } from "@codemirror/language";
6
- import { javascript } from "@codemirror/legacy-modes/mode/javascript.js";
9
+ //legacy mode imports
7
10
  import { jinja2 } from "@codemirror/legacy-modes/mode/jinja2.js";
8
11
  import { mathematica } from "@codemirror/legacy-modes/mode/mathematica.js";
9
12
  import { ntriples } from "@codemirror/legacy-modes/mode/ntriples.js";
10
13
  import { python } from "@codemirror/legacy-modes/mode/python.js";
11
14
  import { sparql } from "@codemirror/legacy-modes/mode/sparql.js";
12
- import { sql } from "@codemirror/legacy-modes/mode/sql.js";
13
15
  import { turtle } from "@codemirror/legacy-modes/mode/turtle.js";
14
- import { yaml } from "@codemirror/legacy-modes/mode/yaml.js";
15
16
  //adaptations
16
17
  import { adaptedSyntaxHighlighting } from "../tests/codemirrorTestHelper.js";
17
18
  var supportedModes = {
@@ -29,10 +30,18 @@ var supportedModes = {
29
30
  javascript: javascript,
30
31
  };
31
32
  export var supportedCodeEditorModes = Object.keys(supportedModes);
33
+ var v6AdaptedModes = new Map([
34
+ ["json", true],
35
+ ["markdown", true],
36
+ ["xml", true],
37
+ ["sql", true],
38
+ ["yaml", true],
39
+ ["javascript", true],
40
+ ]);
32
41
  export var useCodeMirrorModeExtension = function (mode) {
33
42
  return !mode
34
43
  ? adaptedSyntaxHighlighting(defaultHighlightStyle)
35
- : ["json", "markdown", "xml"].includes(mode)
44
+ : v6AdaptedModes.has(mode)
36
45
  ? (typeof supportedModes[mode] === "function" ? supportedModes[mode] : function () { return null; })()
37
46
  : StreamLanguage === null || StreamLanguage === void 0 ? void 0 : StreamLanguage.define(supportedModes[mode]);
38
47
  };
package/dist/esm/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useCodemirrorModeExtension.hooks.js","sourceRoot":"","sources":["../../../../../src/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,eAAe;AACf,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAmB,cAAc,EAAgB,MAAM,sBAAsB,CAAC;AAC5G,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,mCAAmC,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE1D,aAAa;AACb,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,IAAM,cAAc,GAAG;IACnB,QAAQ,UAAA;IACR,MAAM,QAAA;IACN,MAAM,QAAA;IACN,MAAM,QAAA;IACN,GAAG,KAAA;IACH,IAAI,MAAA;IACJ,MAAM,QAAA;IACN,IAAI,MAAA;IACJ,QAAQ,UAAA;IACR,WAAW,aAAA;IACX,GAAG,KAAA;IACH,UAAU,YAAA;CACJ,CAAC;AAEX,MAAM,CAAC,IAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAuC,CAAC;AAG1G,MAAM,CAAC,IAAM,0BAA0B,GAAG,UAAC,IAA+B;IACtE,OAAO,CAAC,IAAI;QACR,CAAC,CAAC,yBAAyB,CAAC,qBAAqB,CAAC;QAClD,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAE,CAAC,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAM,OAAA,IAAI,EAAJ,CAAI,CAA2B,EAAE;YAC/G,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAA0B,CAAC,CAAC;AAChF,CAAC,CAAC"}
1
+ {"version":3,"file":"useCodemirrorModeExtension.hooks.js","sourceRoot":"","sources":["../../../../../src/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAmB,cAAc,EAAgB,MAAM,sBAAsB,CAAC;AAC5G,qBAAqB;AACrB,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAE9D,aAAa;AACb,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,IAAM,cAAc,GAAG;IACnB,QAAQ,UAAA;IACR,MAAM,QAAA;IACN,MAAM,QAAA;IACN,MAAM,QAAA;IACN,GAAG,KAAA;IACH,IAAI,MAAA;IACJ,MAAM,QAAA;IACN,IAAI,MAAA;IACJ,QAAQ,UAAA;IACR,WAAW,aAAA;IACX,GAAG,KAAA;IACH,UAAU,YAAA;CACJ,CAAC;AAEX,MAAM,CAAC,IAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAuC,CAAC;AAG1G,IAAM,cAAc,GAAmD,IAAI,GAAG,CAAC;IAC3E,CAAC,MAAM,EAAE,IAAI,CAAC;IACd,CAAC,UAAU,EAAE,IAAI,CAAC;IAClB,CAAC,KAAK,EAAE,IAAI,CAAC;IACb,CAAC,KAAK,EAAE,IAAI,CAAC;IACb,CAAC,MAAM,EAAE,IAAI,CAAC;IACd,CAAC,YAAY,EAAE,IAAI,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,IAAM,0BAA0B,GAAG,UAAC,IAA+B;IACtE,OAAO,CAAC,IAAI;QACR,CAAC,CAAC,yBAAyB,CAAC,qBAAqB,CAAC;QAClD,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC;YAC1B,CAAC,CAAE,CAAC,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAM,OAAA,IAAI,EAAJ,CAAI,CAA2B,EAAE;YAC/G,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAA0B,CAAC,CAAC;AAChF,CAAC,CAAC"}
package/dist/types/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.d.ts CHANGED
@@ -1,21 +1,23 @@
1
+ import { javascript } from "@codemirror/lang-javascript";
1
2
  import { json } from "@codemirror/lang-json";
2
3
  import { markdown } from "@codemirror/lang-markdown";
4
+ import { sql } from "@codemirror/lang-sql";
3
5
  import { xml } from "@codemirror/lang-xml";
6
+ import { yaml } from "@codemirror/lang-yaml";
4
7
  import { StreamParser } from "@codemirror/language";
5
- import { sql } from "@codemirror/legacy-modes/mode/sql";
6
8
  declare const supportedModes: {
7
9
  readonly markdown: typeof markdown;
8
10
  readonly python: StreamParser<unknown>;
9
11
  readonly sparql: StreamParser<unknown>;
10
12
  readonly turtle: StreamParser<unknown>;
11
13
  readonly xml: typeof xml;
12
- readonly yaml: StreamParser<unknown>;
14
+ readonly yaml: typeof yaml;
13
15
  readonly jinja2: StreamParser<unknown>;
14
16
  readonly json: typeof json;
15
17
  readonly ntriples: StreamParser<unknown>;
16
18
  readonly mathematica: StreamParser<unknown>;
17
19
  readonly sql: typeof sql;
18
- readonly javascript: StreamParser<unknown>;
20
+ readonly javascript: typeof javascript;
19
21
  };
20
22
  export declare const supportedCodeEditorModes: Array<keyof typeof supportedModes>;
21
23
  export type SupportedCodeEditorModes = (typeof supportedCodeEditorModes)[number];
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@eccenca/gui-elements",
3
3
  "description": "GUI elements based on other libraries, usable in React application, written in Typescript.",
4
- "version": "24.1.0-rc.1",
4
+ "version": "24.1.0-rc.2",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://github.com/eccenca/gui-elements",
7
7
  "bugs": "https://github.com/eccenca/gui-elements/issues",
@@ -72,10 +72,13 @@
72
72
  "@blueprintjs/core": "^5.16.2",
73
73
  "@blueprintjs/select": "^5.3.7",
74
74
  "@carbon/icons": "^11.53.0",
75
- "@carbon/react": "^1.72.0",
75
+ "@carbon/react": "1.72.0",
76
+ "@codemirror/lang-javascript": "^6.2.2",
76
77
  "@codemirror/lang-json": "^6.0.1",
77
78
  "@codemirror/lang-markdown": "^6.3.1",
79
+ "@codemirror/lang-sql": "^6.8.0",
78
80
  "@codemirror/lang-xml": "^6.1.0",
81
+ "@codemirror/lang-yaml": "^6.1.2",
79
82
  "@codemirror/legacy-modes": "^6.4.2",
80
83
  "@mavrin/remark-typograf": "^2.2.0",
81
84
  "classnames": "^2.5.1",
package/src/extensions/codemirror/hooks/useCodemirrorModeExtension.hooks.ts CHANGED
@@ -1,17 +1,18 @@
1
+ //adapted v6 modes imports
2
+ import { javascript } from "@codemirror/lang-javascript";
1
3
  import { json } from "@codemirror/lang-json";
2
- //modes imports
3
4
  import { markdown } from "@codemirror/lang-markdown";
5
+ import { sql } from "@codemirror/lang-sql";
4
6
  import { xml } from "@codemirror/lang-xml";
7
+ import { yaml } from "@codemirror/lang-yaml";
5
8
  import { defaultHighlightStyle, LanguageSupport, StreamLanguage, StreamParser } from "@codemirror/language";
6
- import { javascript } from "@codemirror/legacy-modes/mode/javascript";
9
+ //legacy mode imports
7
10
  import { jinja2 } from "@codemirror/legacy-modes/mode/jinja2";
8
11
  import { mathematica } from "@codemirror/legacy-modes/mode/mathematica";
9
12
  import { ntriples } from "@codemirror/legacy-modes/mode/ntriples";
10
13
  import { python } from "@codemirror/legacy-modes/mode/python";
11
14
  import { sparql } from "@codemirror/legacy-modes/mode/sparql";
12
- import { sql } from "@codemirror/legacy-modes/mode/sql";
13
15
  import { turtle } from "@codemirror/legacy-modes/mode/turtle";
14
- import { yaml } from "@codemirror/legacy-modes/mode/yaml";
15
16
 
16
17
  //adaptations
17
18
  import { adaptedSyntaxHighlighting } from "../tests/codemirrorTestHelper";
@@ -34,10 +35,19 @@ const supportedModes = {
34
35
  export const supportedCodeEditorModes = Object.keys(supportedModes) as Array<keyof typeof supportedModes>;
35
36
  export type SupportedCodeEditorModes = (typeof supportedCodeEditorModes)[number];
36
37
 
38
+ const v6AdaptedModes: ReadonlyMap<SupportedCodeEditorModes, boolean> = new Map([
39
+ ["json", true],
40
+ ["markdown", true],
41
+ ["xml", true],
42
+ ["sql", true],
43
+ ["yaml", true],
44
+ ["javascript", true],
45
+ ]);
46
+
37
47
  export const useCodeMirrorModeExtension = (mode?: SupportedCodeEditorModes) => {
38
48
  return !mode
39
49
  ? adaptedSyntaxHighlighting(defaultHighlightStyle)
40
- : ["json", "markdown", "xml"].includes(mode)
50
+ : v6AdaptedModes.has(mode)
41
51
  ? ((typeof supportedModes[mode] === "function" ? supportedModes[mode] : () => null) as () => LanguageSupport)()
42
52
  : StreamLanguage?.define(supportedModes[mode] as StreamParser<unknown>);
43
53
  };