@dative-gpi/foundation-shared-components 0.0.39 → 0.0.41

package/components/FSForm.vue

@@ -27,8 +27,8 @@ export default defineComponent({
       default: "standard"
     }
   },
-  emits: ["update:modelValue"],
-  setup(props) {
+  emits: ["update:modelValue", "submit"],
+  setup(props, { emit }) {
     const formRef = ref<HTMLFormElement | null>(null);
     const submitted = ref(false);
 
@@ -40,10 +40,14 @@ export default defineComponent({
       }
     });
 
-    const onSubmit = (event: SubmitEvent) => {
+    const onSubmit = async (event: SubmitEvent) => {
       event.stopImmediatePropagation();
       event.preventDefault();
       submitted.value = true;
+      await formRef.value.validate();
+      emit("update:modelValue", !!formRef.value.isValid);
+      emit("submit", !!formRef.value.isValid);
+      
     }; 
 
     provide("validateOn", validateOn);

package/components/FSToggleSet.vue

@@ -57,7 +57,7 @@
           :color="getColor(item)"
           :class="getClass(item)"
           :label="item.label"
-          :icon="label.icon"
+          :icon="item.icon"
           :key="index"
           @click="toggle(item)"
         />

package/components/fields/FSRichTextField.vue

@@ -163,7 +163,7 @@
 import { $createParagraphNode, $getSelection, $isElementNode, $isRangeSelection, $setSelection, CAN_UNDO_COMMAND, createEditor, ElementNode, FORMAT_ELEMENT_COMMAND, FORMAT_TEXT_COMMAND, ParagraphNode, UNDO_COMMAND } from "lexical";
 import { $createHeadingNode, HeadingNode, HeadingTagType, registerRichText } from "@lexical/rich-text";
 import { createEmptyHistoryState, registerHistory } from "@lexical/history";
-import { computed, defineComponent, onMounted, PropType, ref } from "vue";
+import { computed, defineComponent, onMounted, PropType, ref, watch } from "vue";
 import { $createLinkNode, $isLinkNode, LinkNode } from "@lexical/link";
 import { $wrapNodes } from "@lexical/selection";
 
@@ -243,9 +243,11 @@ export default defineComponent({
     const isStrikethrough = ref(false);
 
     const id = `${Math.random()}-editor`;
+    const emptyState = "{\"root\":{\"children\":[{\"children\":[],\"direction\":null,\"format\":\"\",\"indent\":0,\"type\":\"paragraph\",\"version\":1}],\"direction\":null,\"format\":\"\",\"indent\":0,\"type\":\"root\",\"version\":1}}";
 
-    const linkUrl = ref("https://");
 
+    const linkUrl = ref("https://");
+    
     const config = {
       namespace: "MyEditor",
       theme: {
@@ -285,6 +287,11 @@ export default defineComponent({
           editor.setEditorState(editor.parseEditorState(props.modelValue));
         });
       }
+      else {
+        editor.update((): void => {
+          editor.setEditorState(editor.parseEditorState(emptyState));
+        });
+      }
     });
 
     const readonly = computed((): boolean => {
@@ -533,6 +540,21 @@ export default defineComponent({
       isLink.value = false;
     }
 
+    watch(() => props.modelValue, () => {
+      if (props.modelValue != JSON.stringify(editor.getEditorState().toJSON())) {
+        if (props.modelValue != null) {
+          editor.update(() => {
+            editor.setEditorState(editor.parseEditorState(props.modelValue));
+          });
+        }
+        else {
+          editor.update(() => {
+            editor.setEditorState(editor.parseEditorState(emptyState));
+          });
+        }
+      }
+    });
+
     return {
       readonly,
       style,

package/composables/useColors.ts

@@ -71,7 +71,7 @@ export const useColors = () => {
                 soft: getSoft(seed).hex(),
                 softContrast: getContrast(seed, dark).hex(),
                 base: seed.hex(),
-                baseContrast: getContrast(seed, base).hex(),
+                baseContrast: getContrast(seed, dark).hex(),
                 dark: dark.hex(),
                 darkContrast: getContrast(dark, light).hex()
             };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "0.0.39",
-    "@dative-gpi/foundation-shared-services": "0.0.39",
+    "@dative-gpi/foundation-shared-domain": "0.0.41",
+    "@dative-gpi/foundation-shared-services": "0.0.41",
     "@fontsource/montserrat": "^5.0.16",
     "@lexical/clipboard": "^0.12.5",
     "@lexical/history": "^0.12.5",
@@ -32,5 +32,5 @@
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2"
   },
-  "gitHead": "f4259f72e37e80ea5276d61fa030956976738397"
+  "gitHead": "35e8912ae4de63d3e590f6f4f80eb95619c5b57b"
 }