@stubber/form-fields 1.4.3 → 1.4.5

package/dist/fields/components/Code.svelte

@@ -1,4 +1,10 @@
-<script>import { acceptCompletion, CompletionContext } from "@codemirror/autocomplete";
+<script>import {
+  acceptCompletion,
+  autocompletion,
+  CompletionContext,
+  completionKeymap,
+  startCompletion
+} from "@codemirror/autocomplete";
 import { javascript, javascriptLanguage } from "@codemirror/lang-javascript";
 import { EditorState } from "@codemirror/state";
 import { EditorView, keymap } from "@codemirror/view";
@@ -12,10 +18,21 @@ $: label = $field.spec?.title;
 $: hide_label = $field.spec?.hide_label;
 $: isValid = !$field.state?.validation || $field.state?.validation?.valid;
 $: validationMessage = $field.state?.validation?.message;
-const tab_accept_completion = keymap.of([
+const custom_completion_keymap = completionKeymap.filter((binding) => binding.key != "Enter").concat([
+  {
+    key: "Enter",
+    run: () => {
+      return false;
+    }
+  },
   {
     key: "Tab",
     run: acceptCompletion
+  },
+  {
+    key: "Ctrl-Space",
+    run: startCompletion,
+    stopPropagation: true
   }
 ]);
 function keysFor(obj) {
@@ -61,7 +78,8 @@ function bind_codemirror(el) {
         basicSetup,
         javascript(),
         stubber_completions,
-        tab_accept_completion,
+        autocompletion({ defaultKeymap: false }),
+        keymap.of(custom_completion_keymap),
         min_height_editor,
         update_listener
       ]

package/dist/fields/components/SmartText.svelte

@@ -1,22 +1,26 @@
 <script>
   import { syncStoreToStore } from "../../utils/syncing";
-  import { deepEqual } from "fast-equals";
-  import _ from "lodash-es";
-  import { onMount, onDestroy } from "svelte";
-  import { writable } from "svelte/store";
   import {
+    acceptCompletion,
+    autocompletion,
+    completionKeymap,
+    startCompletion,
+  } from "@codemirror/autocomplete";
+  import { defaultKeymap, history, historyKeymap } from "@codemirror/commands";
+  import { EditorState, StateField } from "@codemirror/state";
+  import {
+    Decoration,
     EditorView,
-    placeholder,
     MatchDecorator,
-    Decoration,
     ViewPlugin,
     keymap,
+    placeholder,
   } from "@codemirror/view";
-  import { EditorState, StateField } from "@codemirror/state";
-  import { history, defaultKeymap, historyKeymap } from "@codemirror/commands";
-  import { autocompletion } from "@codemirror/autocomplete";
+  import { deepEqual } from "fast-equals";
+  import _ from "lodash-es";
+  import { onDestroy, onMount } from "svelte";
+  import { writable } from "svelte/store";
 
-  import { Input } from "@stubber/ui/input";
   import { Label } from "@stubber/ui/label";
 
   export let field;
@@ -212,6 +216,26 @@
 
   $: is_string = typeof $internal?.raw === "string";
 
+  const custom_completion_keymap = completionKeymap
+    .filter((binding) => binding.key != "Enter")
+    .concat([
+      {
+        key: "Enter",
+        run: () => {
+          return false;
+        },
+      },
+      {
+        key: "Tab",
+        run: acceptCompletion,
+      },
+      {
+        key: "Ctrl-Space",
+        run: startCompletion,
+        stopPropagation: true,
+      },
+    ]);
+
   $: {
     // check if internal.raw is not a string
     if (is_string) {
@@ -220,12 +244,12 @@
           history({ newGroupDelay: 150 }),
           EditorView.lineWrapping,
           contentField,
-          autocompletion({ override: [myCompletions] }),
+          autocompletion({ override: [myCompletions], defaultKeymap: false }),
           placeholder(label),
           EditorView.contentAttributes.of({
             spellcheck: "true",
           }),
-          keymap.of([...defaultKeymap, ...historyKeymap]),
+          keymap.of([...defaultKeymap, ...historyKeymap, ...custom_completion_keymap]),
         ];
 
         if (code_language === "handlebars") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stubber/form-fields",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "An automatic form builder based on field specifications",
   "keywords": [
     "components",
@@ -61,7 +61,7 @@
     "@codemirror/lang-javascript": "^6.2.4",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
-    "@stubber/ui": "^1.12.3",
+    "@stubber/ui": "^1.13.1",
     "ag-grid-community": "^31.0.2",
     "ag-grid-enterprise": "^31.0.2",
     "codemirror": "^6.0.2",