@vc-shell/framework 1.2.4-beta.4 → 1.2.4-beta.5

package/shared/modules/dynamic/components/factories.ts

@@ -1,244 +1,242 @@
-import {
-  IMultivalueField,
-  IControlBaseProps,
-  ISelectField,
-  IInputField,
-  ICardCollection,
-  IEditorField,
-  IGallery,
-  IDynamicProperties,
-  ICheckbox,
-  IButton,
-  IInputCurrency,
-  IFieldset,
-  IStatusField,
-  IContentField,
-  IVideoField,
-  IImageField,
-  ITextareaField,
-  ISwitch,
-  ITable,
-  IRating,
-  IRadioButton,
-} from "@shared/modules/dynamic/types/models";
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { markRaw } from "vue";
-import {
-  VcButton,
-  VcCard,
-  VcCheckbox,
-  VcDynamicProperty,
-  VcEditor,
-  VcField,
-  VcGallery,
-  VcImage,
-  VcInput,
-  VcInputCurrency,
-  VcSelect,
-  VcStatus,
-  VcVideo,
-  VcTextarea,
-  VcMultivalue,
-  VcSwitch,
-  VcTable,
-  VcRating,
-  VcRadioButton,
-} from "@ui/components";
-
-export const ControlBaseProps = ({
-  rules = undefined,
-  label = undefined,
-  placeholder = undefined,
-  disabled = false,
-  required = false,
-  name = undefined,
-  tooltip = undefined,
-  key = undefined,
-  classNames = undefined,
-  ...rest
-}: IControlBaseProps): IControlBaseProps => ({
-  key,
-  rules,
-  label,
-  placeholder,
-  disabled,
-  required,
-  name,
-  tooltip,
-  classNames,
-  ...rest,
-});
-
-export const MultivalueField = ({ props, slots }: IMultivalueField): IMultivalueField => ({
-  component: markRaw(VcMultivalue),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-
-  slots,
-});
-
-export const SelectField = ({ props, slots }: ISelectField): ISelectField => ({
-  component: markRaw(VcSelect) as any,
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-
-  slots,
-});
-
-export const StatusField = ({ props, slots }: IStatusField): IStatusField => ({
-  component: markRaw(VcStatus),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-
-  slots,
-});
-
-export const InputField = ({ props, slots }: IInputField): IInputField => ({
-  component: markRaw(VcInput),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-
-  slots,
-});
-
-export const TextareaField = ({ props }: ITextareaField): ITextareaField => ({
-  component: markRaw(VcTextarea),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const ContentField = ({ props }: IContentField): IContentField => ({
-  component: markRaw(VcField),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const ImageField = ({ props }: IImageField): IImageField => ({
-  component: markRaw(VcImage),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const VideoField = ({ props }: IInputField): IVideoField => ({
-  component: markRaw(VcVideo),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const InputCurrency = ({ props }: IInputCurrency): IInputCurrency => ({
-  component: markRaw(VcInputCurrency),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const CardCollection = ({ props, slots }: ICardCollection): ICardCollection => ({
-  component: markRaw(VcCard),
-  props: {
-    ...props,
-    ...ControlBaseProps(props),
-  },
-
-  slots,
-});
-
-export const DynamicProperties = ({ props }: IDynamicProperties): IDynamicProperties => ({
-  component: markRaw(VcDynamicProperty),
-  props: {
-    ...props,
-    ...ControlBaseProps(props),
-  },
-});
-
-export const EditorField = ({ props }: IEditorField): IEditorField => ({
-  component: markRaw(VcEditor),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const Gallery = ({ props }: IGallery): IGallery => ({
-  component: markRaw(VcGallery),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const Checkbox = ({ props, slots }: ICheckbox): ICheckbox => ({
-  component: markRaw(VcCheckbox),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-
-  slots,
-});
-
-export const RadioButton = ({ props }: IRadioButton): IRadioButton => ({
-  component: markRaw(VcRadioButton),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const Button = ({ props, slots }: IButton): IButton => ({
-  component: markRaw(VcButton),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-
-  slots,
-});
-
-export const Switch = ({ props }: ISwitch): ISwitch => ({
-  component: markRaw(VcSwitch),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
-
-export const Fieldset = ({ columns, fields, property, remove }: IFieldset): IFieldset => ({
-  columns,
-  fields,
-  property,
-  remove,
-});
-
-export const Table = ({ props, slots }: ITable): ITable => ({
-  component: markRaw(VcTable),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-  slots,
-});
-
-export const Rating = ({ props }: IRating): IRating => ({
-  component: markRaw(VcRating),
-  props: {
-    ...ControlBaseProps(props),
-    ...props,
-  },
-});
+import {
+  IMultivalueField,
+  IControlBaseProps,
+  ISelectField,
+  IInputField,
+  ICardCollection,
+  IEditorField,
+  IGallery,
+  IDynamicProperties,
+  ICheckbox,
+  IButton,
+  IInputCurrency,
+  IFieldset,
+  IStatusField,
+  IContentField,
+  IVideoField,
+  IImageField,
+  ITextareaField,
+  ISwitch,
+  ITable,
+  IRating,
+  IRadioButton,
+} from "@shared/modules/dynamic/types/models";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { markRaw } from "vue";
+import { VcButton } from "@ui/components/atoms/vc-button";
+import { VcCard } from "@ui/components/atoms/vc-card";
+import { VcCheckbox } from "@ui/components/molecules/vc-checkbox";
+import { VcDynamicProperty } from "@ui/components/organisms/vc-dynamic-property";
+import { VcEditor } from "@ui/components/molecules/vc-editor";
+import { VcField } from "@ui/components/molecules/vc-field";
+import { VcGallery } from "@ui/components/organisms/vc-gallery";
+import { VcImage } from "@ui/components/atoms/vc-image";
+import { VcInput } from "@ui/components/molecules/vc-input";
+import { VcInputCurrency } from "@ui/components/molecules/vc-input-currency";
+import { VcSelect } from "@ui/components/molecules/vc-select";
+import { VcStatus } from "@ui/components/atoms/vc-status";
+import { VcVideo } from "@ui/components/atoms/vc-video";
+import { VcTextarea } from "@ui/components/molecules/vc-textarea";
+import { VcMultivalue } from "@ui/components/molecules/vc-multivalue";
+import { VcSwitch } from "@ui/components/molecules/vc-switch";
+import { VcTable } from "@ui/components/organisms/vc-table";
+import { VcRating } from "@ui/components/molecules/vc-rating";
+import { VcRadioButton } from "@ui/components/molecules/vc-radio-button";
+
+export const ControlBaseProps = ({
+  rules = undefined,
+  label = undefined,
+  placeholder = undefined,
+  disabled = false,
+  required = false,
+  name = undefined,
+  tooltip = undefined,
+  key = undefined,
+  classNames = undefined,
+  ...rest
+}: IControlBaseProps): IControlBaseProps => ({
+  key,
+  rules,
+  label,
+  placeholder,
+  disabled,
+  required,
+  name,
+  tooltip,
+  classNames,
+  ...rest,
+});
+
+export const MultivalueField = ({ props, slots }: IMultivalueField): IMultivalueField => ({
+  component: markRaw(VcMultivalue),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+
+  slots,
+});
+
+export const SelectField = ({ props, slots }: ISelectField): ISelectField => ({
+  component: markRaw(VcSelect) as any,
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+
+  slots,
+});
+
+export const StatusField = ({ props, slots }: IStatusField): IStatusField => ({
+  component: markRaw(VcStatus),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+
+  slots,
+});
+
+export const InputField = ({ props, slots }: IInputField): IInputField => ({
+  component: markRaw(VcInput),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+
+  slots,
+});
+
+export const TextareaField = ({ props }: ITextareaField): ITextareaField => ({
+  component: markRaw(VcTextarea),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const ContentField = ({ props }: IContentField): IContentField => ({
+  component: markRaw(VcField),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const ImageField = ({ props }: IImageField): IImageField => ({
+  component: markRaw(VcImage),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const VideoField = ({ props }: IInputField): IVideoField => ({
+  component: markRaw(VcVideo),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const InputCurrency = ({ props }: IInputCurrency): IInputCurrency => ({
+  component: markRaw(VcInputCurrency),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const CardCollection = ({ props, slots }: ICardCollection): ICardCollection => ({
+  component: markRaw(VcCard),
+  props: {
+    ...props,
+    ...ControlBaseProps(props),
+  },
+
+  slots,
+});
+
+export const DynamicProperties = ({ props }: IDynamicProperties): IDynamicProperties => ({
+  component: markRaw(VcDynamicProperty),
+  props: {
+    ...props,
+    ...ControlBaseProps(props),
+  },
+});
+
+export const EditorField = ({ props }: IEditorField): IEditorField => ({
+  component: markRaw(VcEditor),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const Gallery = ({ props }: IGallery): IGallery => ({
+  component: markRaw(VcGallery),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const Checkbox = ({ props, slots }: ICheckbox): ICheckbox => ({
+  component: markRaw(VcCheckbox),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+
+  slots,
+});
+
+export const RadioButton = ({ props }: IRadioButton): IRadioButton => ({
+  component: markRaw(VcRadioButton),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const Button = ({ props, slots }: IButton): IButton => ({
+  component: markRaw(VcButton),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+
+  slots,
+});
+
+export const Switch = ({ props }: ISwitch): ISwitch => ({
+  component: markRaw(VcSwitch),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});
+
+export const Fieldset = ({ columns, fields, property, remove }: IFieldset): IFieldset => ({
+  columns,
+  fields,
+  property,
+  remove,
+});
+
+export const Table = ({ props, slots }: ITable): ITable => ({
+  component: markRaw(VcTable),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+  slots,
+});
+
+export const Rating = ({ props }: IRating): IRating => ({
+  component: markRaw(VcRating),
+  props: {
+    ...ControlBaseProps(props),
+    ...props,
+  },
+});

package/shared/modules/dynamic/components/fields/Fieldset.ts

@@ -1,65 +1,66 @@
-import { h, toRefs, ExtractPropTypes, toValue } from "vue";
-import componentProps from "@shared/modules/dynamic/components/fields/props";
-import * as _ from "lodash-es";
-import { VcCol, VcRow } from "@ui/components";
-import { FieldsetSchema } from "@shared/modules/dynamic/types";
-import { unrefNested } from "@shared/modules/dynamic/helpers/unrefNested";
-
-export default {
-  name: "Fieldset",
-  props: componentProps,
-  setup(props: ExtractPropTypes<typeof componentProps> & { element: FieldsetSchema }) {
-    const { fields: fieldsetFields } = toRefs(props);
-
-    return () =>
-      toValue(fieldsetFields.value)?.map((fields, index, arr) => {
-        const divideByCols = _.chunk(fields, props.element.columns || 1) ?? [];
-
-        return h(
-          "div",
-          {
-            class: `tw-flex tw-row tw-relative ${unrefNested(props.baseProps).classNames ?? ""}`,
-            key: `fieldset-${index}`,
-          },
-          [
-            h("div", { class: "tw-flex-1 tw-gap-4 tw-flex tw-flex-col tw-min-w-0" }, [
-              divideByCols.map((itemsArr, colIndex) => {
-                return h(
-                  VcRow,
-                  {
-                    key: `col-${colIndex}-${index}`,
-                    class: {
-                      "tw-relative": true,
-                      "tw-gap-4": true,
-                      "!tw-flex-wrap": true,
-                      "!tw-flex !tw-flex-row": !!props.element.aspectRatio,
-                    },
-                  },
-                  () => [
-                    ...itemsArr.map((item, itemIndex) => {
-                      return h(
-                        VcCol,
-                        {
-                          key: `col-${itemIndex}-${colIndex}-${index}`,
-                          size: "aspectRatio" in props.element ? props.element.aspectRatio?.[itemIndex] : 1,
-                        },
-                        () => {
-                          if (typeof item === "object") {
-                            return h(item, {
-                              elIndex: index,
-                              rows: arr.length,
-                              key: `item-${itemIndex}-${colIndex}-${index}`,
-                            });
-                          }
-                        },
-                      );
-                    }),
-                  ],
-                );
-              }),
-            ]),
-          ],
-        );
-      });
-  },
-};
+import { h, toRefs, ExtractPropTypes, toValue } from "vue";
+import componentProps from "@shared/modules/dynamic/components/fields/props";
+import * as _ from "lodash-es";
+import { VcCol } from "@ui/components/atoms/vc-col";
+import { VcRow } from "@ui/components/atoms/vc-row";
+import { FieldsetSchema } from "@shared/modules/dynamic/types";
+import { unrefNested } from "@shared/modules/dynamic/helpers/unrefNested";
+
+export default {
+  name: "Fieldset",
+  props: componentProps,
+  setup(props: ExtractPropTypes<typeof componentProps> & { element: FieldsetSchema }) {
+    const { fields: fieldsetFields } = toRefs(props);
+
+    return () =>
+      toValue(fieldsetFields.value)?.map((fields, index, arr) => {
+        const divideByCols = _.chunk(fields, props.element.columns || 1) ?? [];
+
+        return h(
+          "div",
+          {
+            class: `tw-flex tw-row tw-relative ${unrefNested(props.baseProps).classNames ?? ""}`,
+            key: `fieldset-${index}`,
+          },
+          [
+            h("div", { class: "tw-flex-1 tw-gap-4 tw-flex tw-flex-col tw-min-w-0" }, [
+              divideByCols.map((itemsArr, colIndex) => {
+                return h(
+                  VcRow,
+                  {
+                    key: `col-${colIndex}-${index}`,
+                    class: {
+                      "tw-relative": true,
+                      "tw-gap-4": true,
+                      "!tw-flex-wrap": true,
+                      "!tw-flex !tw-flex-row": !!props.element.aspectRatio,
+                    },
+                  },
+                  () => [
+                    ...itemsArr.map((item, itemIndex) => {
+                      return h(
+                        VcCol,
+                        {
+                          key: `col-${itemIndex}-${colIndex}-${index}`,
+                          size: "aspectRatio" in props.element ? props.element.aspectRatio?.[itemIndex] : 1,
+                        },
+                        () => {
+                          if (typeof item === "object") {
+                            return h(item, {
+                              elIndex: index,
+                              rows: arr.length,
+                              key: `item-${itemIndex}-${colIndex}-${index}`,
+                            });
+                          }
+                        },
+                      );
+                    }),
+                  ],
+                );
+              }),
+            ]),
+          ],
+        );
+      });
+  },
+};

package/shared/modules/dynamic/components/fields/GalleryField.ts

@@ -1,8 +1,9 @@
 import { Component, ExtractPropTypes, computed, h, markRaw, ref, toRefs, toValue, unref, watch } from "vue";
 import { Gallery } from "@shared/modules/dynamic/components/factories";
 import componentProps from "@shared/modules/dynamic/components/fields/props";
-import { ICommonAsset } from "@core/types";
-import { useBladeNavigation, usePopup } from "@shared/components";
+import type { ICommonAsset } from "@core/types";
+import { useBladeNavigation } from "@shared/components/blade-navigation/composables";
+import { usePopup } from "@shared/components/popup-handler/composables/usePopup";
 import { useI18n } from "vue-i18n";
 import { default as AssetsDetails } from "@shared/modules/assets/components/assets-details/assets-details.vue";
 import * as _ from "lodash-es";