@3squared/forge-ui-3 0.6.1 → 0.7.1

package/dist/src/components/ForgeFormField.vue.d.ts

@@ -1,42 +1,59 @@
-import { TypedSchema } from 'vee-validate';
 import { ForgeFormFieldTypes } from '../types/forge-types';
 
 export interface ForgeFormFieldProps {
     name: string;
     label: string;
     type?: ForgeFormFieldTypes;
-    rules?: TypedSchema;
     mask?: string;
     placeholder?: string;
 }
-declare const _default: import('vue').DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ForgeFormFieldProps>, {
-    mask: string;
-    placeholder: string;
-    type: string;
-}>, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ForgeFormFieldProps>, {
-    mask: string;
-    placeholder: string;
-    type: string;
-}>>>, {
+declare const _default: import('vue').DefineComponent<{
+    modelValue: import('vue').PropType<any>;
+    label: {
+        type: import('vue').PropType<string>;
+        required: true;
+    };
+    name: {
+        type: import('vue').PropType<string>;
+        required: true;
+    };
+    type: {
+        type: import('vue').PropType<ForgeFormFieldTypes>;
+        default: string;
+    };
+    placeholder: {
+        type: import('vue').PropType<string>;
+        default: string;
+    };
+    mask: {
+        type: import('vue').PropType<string>;
+        default: string;
+    };
+}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    modelValue: import('vue').PropType<any>;
+    label: {
+        type: import('vue').PropType<string>;
+        required: true;
+    };
+    name: {
+        type: import('vue').PropType<string>;
+        required: true;
+    };
+    type: {
+        type: import('vue').PropType<ForgeFormFieldTypes>;
+        default: string;
+    };
+    placeholder: {
+        type: import('vue').PropType<string>;
+        default: string;
+    };
+    mask: {
+        type: import('vue').PropType<string>;
+        default: string;
+    };
+}>>, {
     type: ForgeFormFieldTypes;
     placeholder: string;
     mask: string;
 }, {}>;
 export default _default;
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToRuntimeProps<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};

package/dist/src/components/ForgeInlineEditor.vue.d.ts

@@ -1,8 +1,5 @@
-import { TypedSchema } from 'vee-validate';
-
 export interface ForgeInlineEditorProps {
     name?: string;
-    rules?: TypedSchema;
     completeAction?: Function;
     errorAction?: Function;
     params?: Array<any>;
@@ -16,7 +13,7 @@ declare function __VLS_template(): {
         };
         editFinished: () => Promise<false | undefined>;
         cancel: () => void;
-        val: any;
+        val: unknown;
     }): any;
     default?(_: {}): any;
 };
@@ -40,9 +37,6 @@ declare const __VLS_component: import('vue').DefineComponent<{
         type: import('vue').PropType<boolean>;
         default: boolean;
     };
-    rules: {
-        type: import('vue').PropType<TypedSchema<any, any>>;
-    };
     completeAction: {
         type: import('vue').PropType<Function>;
     };
@@ -66,9 +60,6 @@ declare const __VLS_component: import('vue').DefineComponent<{
         type: import('vue').PropType<boolean>;
         default: boolean;
     };
-    rules: {
-        type: import('vue').PropType<TypedSchema<any, any>>;
-    };
     completeAction: {
         type: import('vue').PropType<Function>;
     };

package/dist/src/components/ForgeModal.vue.d.ts

@@ -5,6 +5,8 @@ export interface ForgeModalProps extends DialogProps {
     submitText?: string;
     showFooter?: boolean;
     onConfirm?: Function | null;
+    submitButtonType?: 'button' | 'reset' | 'submit';
+    cancelButtonType?: 'button' | 'reset' | 'submit';
 }
 declare function __VLS_template(): Partial<Record<NonNullable<keyof DialogSlots>, (_: any) => any>> & {
     loader?(_: {}): any;
@@ -68,6 +70,14 @@ declare const __VLS_component: import('vue').DefineComponent<{
         type: import('vue').PropType<Function | null>;
         default: null;
     };
+    submitButtonType: {
+        type: import('vue').PropType<"submit" | "reset" | "button">;
+        default: string;
+    };
+    cancelButtonType: {
+        type: import('vue').PropType<"submit" | "reset" | "button">;
+        default: string;
+    };
     modal: {
         type: import('vue').PropType<boolean>;
         default: boolean;
@@ -180,6 +190,14 @@ declare const __VLS_component: import('vue').DefineComponent<{
         type: import('vue').PropType<Function | null>;
         default: null;
     };
+    submitButtonType: {
+        type: import('vue').PropType<"submit" | "reset" | "button">;
+        default: string;
+    };
+    cancelButtonType: {
+        type: import('vue').PropType<"submit" | "reset" | "button">;
+        default: string;
+    };
     modal: {
         type: import('vue').PropType<boolean>;
         default: boolean;
@@ -240,6 +258,8 @@ declare const __VLS_component: import('vue').DefineComponent<{
     cancelText: string;
     showFooter: boolean;
     onConfirm: Function | null;
+    submitButtonType: "button" | "reset" | "submit";
+    cancelButtonType: "button" | "reset" | "submit";
     modal: boolean;
     showHeader: boolean;
 }, {}>;

package/dist/src/components/ForgeMultiSelect.vue.d.ts

@@ -1,5 +1,4 @@
 import { Severity } from '../types/forge-types';
-import { TypedSchema } from 'vee-validate';
 
 export interface ForgeMultiSelectProps {
     severity?: Severity;
@@ -7,7 +6,6 @@ export interface ForgeMultiSelectProps {
     showClearSelection?: boolean;
     expandLeft?: boolean;
     selectValue?: string;
-    rules?: TypedSchema;
     name?: string;
 }
 declare function __VLS_template(): Partial<Record<NonNullable<string | number>, (_: {

package/dist/src/components/table/ForgeFilterHeader.vue.d.ts

@@ -1,5 +1,5 @@
 export interface ForgeFilterHeaderProps {
-    dataType: string | undefined;
+    dataType: 'numeric' | 'date' | 'multiselect' | 'select' | undefined;
     dropdownOptions?: any[];
 }
 declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<ForgeFilterHeaderProps>, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<ForgeFilterHeaderProps>>>, {}, {}>;

package/dist/src/components/table/ForgeTable.vue.d.ts

@@ -4,7 +4,6 @@ import { Severity } from '../../types/forge-types';
 export interface ForgeTableProps extends DataTableProps {
     value: any[];
     legacyPaginationFooter?: boolean;
-    total?: number;
     showClearButton?: boolean;
     showExporterButton?: boolean;
     stickyHeader?: boolean;
@@ -22,7 +21,10 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_WithDefaults<
     showExporterButton: boolean;
     stickyHeader: boolean;
 }>, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    page: (...args: any[]) => void;
+    sort: (...args: any[]) => void;
     "update:filters": (...args: any[]) => void;
+    "update:tableContext": (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ForgeTableProps>, {
     legacyPaginationFooter: boolean;
     paginator: boolean;
@@ -31,7 +33,10 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_WithDefaults<
     showExporterButton: boolean;
     stickyHeader: boolean;
 }>>> & {
+    onPage?: ((...args: any[]) => any) | undefined;
+    onSort?: ((...args: any[]) => any) | undefined;
     "onUpdate:filters"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:tableContext"?: ((...args: any[]) => any) | undefined;
 }, {
     legacyPaginationFooter: boolean;
     showClearButton: boolean;

package/dist/src/passthroughs/Column.pt.d.ts

@@ -64,6 +64,7 @@ declare const _default: {
             class: string[];
         };
         columnfilter: string;
+        filterinput: string;
         filterRowItem: (options: ColumnPassThroughMethodOptions) => {
             class: (string | {
                 active: any;

package/dist/src/passthroughs/Multiselect.pt.d.ts

@@ -0,0 +1,23 @@
+import { MultiSelectPassThroughMethodOptions } from 'primevue/multiselect';
+
+declare const _default: {
+    multiselect: {
+        root: ({ props }: MultiSelectPassThroughMethodOptions) => {
+            class: (string | {
+                disabled: boolean | undefined;
+            })[];
+        };
+        panel: string;
+        list: string;
+        item: string;
+        header: string;
+        filterContainer: string;
+        filterIcon: string;
+        filterInput: string;
+        closeButton: string;
+        hiddenInput: string;
+        emptymessage: string;
+        trigger: string;
+    };
+};
+export default _default;

package/dist/src/types/forge-types.d.ts

@@ -1,6 +1,7 @@
 import { ColumnProps } from 'primevue/column';
-import { FilterMatchModeOptions, FilterOperatorOptions } from 'primevue/api';
+import { FilterMatchModeOptions } from 'primevue/api';
 import { FileUploadStatus } from '../components/file-uploader/utilities/utilities';
+import { DataTableFilterMeta } from 'primevue/datatable';
 
 export type Severity = 'primary' | 'secondary' | 'success' | 'warning' | 'danger' | 'info' | 'brand' | undefined;
 export type Size = 'sm' | 'md' | 'lg' | undefined;
@@ -12,12 +13,6 @@ export type ForgeColumnDataType = 'text' | 'numeric' | 'date' | 'select' | 'mult
 export type ForgeColumn = ColumnProps & {
     dataType?: ForgeColumnDataType;
 };
-export type ForgeTableFilter = {
-    value?: any;
-    matchMode?: FilterMatchModeOptions;
-    operator?: FilterOperatorOptions;
-    constraints?: Array<ForgeTableFilterConstraint>;
-};
 export interface ForgeFileStatus {
     file: File;
     status: FileUploadStatus;
@@ -36,3 +31,11 @@ export interface SelectListOption<T> {
     value: T;
     text: string;
 }
+export interface ForgeTableContext {
+    total: number;
+    page: number;
+    perPage: number;
+    sortField: string;
+    sortDirection: 'Asc' | 'Desc' | 'None';
+    filters: DataTableFilterMeta | undefined;
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@3squared/forge-ui-3",
   "repository": "https://github.com/3Squared/ForgeUI-3",
   "description": "ForgeUI 3 is Vue 3 UI Library which combines a variety of popular packages to create a consistent UI for your application.",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "type": "module",
   "license": "MIT",
   "contributors": [
@@ -32,27 +32,26 @@
     "@azure/storage-blob": "^12.17.0",
     "@iconify/vue": "^4.1.1",
     "@popperjs/core": "^2.11.8",
-    "@vee-validate/zod": "^4.11.8",
     "@vueuse/components": "^10.6.1",
     "bootstrap": "5.3.3",
-    "primevue": "^3.48.1",
+    "primevue": "^3.53.0",
     "vee-validate": "^4.11.8",
     "vue": "^3.4.14",
     "vue-multiselect": "^3.0.0-beta.3",
-    "zod": "^3.22.4"
+    "yup": "^1.4.0"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.41",
+    "@cypress/code-coverage": "3.12.42",
     "@vitejs/plugin-vue": "5.0.5",
     "@vitest/coverage-v8": "1.6.0",
     "@vitest/ui": "1.6.0",
-    "cypress": "13.13.0",
+    "cypress": "13.13.1",
     "cypress-real-events": "1.13.0",
     "sass": "1.77.8",
     "typescript": "5.5.3",
-    "unplugin-vue-components": "0.27.2",
+    "unplugin-vue-components": "0.27.3",
     "rollup-plugin-visualizer": "5.12.0",
-    "vite": "5.3.3",
+    "vite": "5.3.4",
     "vite-bundle-visualizer": "1.2.1",
     "vite-plugin-istanbul": "6.0.2",
     "vitest": "1.6.0",

package/src/styles/components/_multiselect.scss

@@ -282,4 +282,8 @@
 .filter-header-multiselect__check-icon {
   top: 1px;
   left: 1px;
+}
+
+[data-pc-section="box"] {
+  display: none
 }

package/src/styles/components/_table.scss

@@ -1,3 +1,7 @@
+table {
+  table-layout: fixed;
+}
+
 table.table-lg {
   // stylelint-disable-next-line selector-max-universal
   > :not(caption) > * > * {

package/src/types/forge-types.ts

@@ -1,6 +1,7 @@
 import { ColumnProps } from "primevue/column";
-import { FilterMatchModeOptions, FilterOperatorOptions } from "primevue/api";
+import { FilterMatchModeOptions } from "primevue/api";
 import { FileUploadStatus } from "../components/file-uploader/utilities/utilities";
+import { DataTableFilterMeta } from "primevue/datatable";
 
 export type Severity = 'primary' | 'secondary' | 'success' | 'warning' | 'danger' | 'info' | 'brand' | undefined
 export type Size = 'sm' | 'md' | 'lg' | undefined
@@ -12,12 +13,6 @@ export type ForgeNavbarPosition = "fixed-top" | "fixed-bottom" | "sticky-top"
 export type ForgeMultiSelectOrientation = "row" | "column"
 export type ForgeColumnDataType = 'text' | 'numeric' | 'date' | 'select' | 'multiselect' | undefined
 export type ForgeColumn = ColumnProps & { dataType?: ForgeColumnDataType }
-export type ForgeTableFilter = { 
-  value?: any,
-  matchMode?: FilterMatchModeOptions,
-  operator?: FilterOperatorOptions,
-  constraints?: Array<ForgeTableFilterConstraint>
-}
 
 export interface ForgeFileStatus {
   file: File;
@@ -40,3 +35,12 @@ export interface SelectListOption<T> {
   value: T;
   text: string;
 }
+
+export interface ForgeTableContext {
+  total: number,
+  page: number,
+  perPage: number,
+  sortField: string,
+  sortDirection: 'Asc' | 'Desc' | 'None',
+  filters: DataTableFilterMeta | undefined
+}