@tsed/react-formio 3.0.0-rc.2 → 3.0.0-rc.20

package/src/organisms/form/useForm.ts

@@ -2,13 +2,14 @@ import { Form } from "@formio/js";
 import { EventEmitter2 } from "eventemitter2";
 import { type MutableRefObject, useEffect, useRef, useState } from "react";
 
-import type { ChangedSubmission, ComponentType, FormOptions, FormType, JSON, SubmissionType } from "../../interfaces";
+import type { ChangedSubmission, ComponentType, FormOptions, FormType, SubmissionType } from "../../interfaces";
+import type { JSON, JSONRecord } from "../../interfaces/JSONRecord.js";
 import { FormCustomEvent } from "./types";
 
 type Webform = any;
 type EventError = string | Error | Error[] | { message: string } | { message: string }[];
 
-export interface UseFormProps<Data extends { [key: string]: JSON } = { [key: string]: JSON }> {
+export interface UseFormProps<Data extends object = JSONRecord> {
   src?: string;
   url?: string;
   form?: FormType;
@@ -54,7 +55,7 @@ const getDefaultEmitter = () => {
   });
 };
 
-function onAnyEvent<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(
+function onAnyEvent<Data extends object = JSONRecord>(
   handlers: Omit<UseFormProps<Data>, "src" | "url" | "form" | "submission" | "options" | "formReady" | "formioform" | "Formio">,
   ...args: [string, ...any[]]
 ) {
@@ -95,7 +96,7 @@ const createWebformInstance = async (
 };
 
 // Define effective props (aka I want to rename these props but also maintain backwards compatibility)
-function getEffectiveProps<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(props: UseFormProps<Data>) {
+function getEffectiveProps<Data extends object = JSONRecord>(props: UseFormProps<Data>) {
   const { FormClass = Form, form, src, url, options, submission, onFormReady, onAsyncSubmit, ...handlers } = props;
 
   return {
@@ -126,7 +127,7 @@ function createCustomValidation(customAction: any, ref: MutableRefObject<Webform
   };
 }
 
-export function useForm<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(props: UseFormProps<Data>) {
+export function useForm<Data extends object = JSONRecord>(props: UseFormProps<Data>) {
   const webformRef = useRef<Webform | null>(null);
   const renderElement = useRef<HTMLDivElement | null>(null);
   const { formSource, FormClass, options, url, submission, handlers, onFormReady, onAsyncSubmit } = getEffectiveProps(props);

package/src/organisms/table/submissions/SubmissionsTable.tsx

@@ -1,19 +1,14 @@
-import type { FormType, JSON, SubmissionType } from "../../../interfaces";
+import type { FormType, SubmissionType } from "../../../interfaces";
+import type { JSONRecord } from "../../../interfaces/JSONRecord";
 import { Table, type TableProps } from "../../../molecules/table/Table";
 import { mapFormToColumns } from "../../../molecules/table/utils/mapFormToColumns.js";
 
-export type SubmissionsTableProps<Data extends { [key: string]: JSON } = { [key: string]: JSON }> = Omit<
-  TableProps<SubmissionType<Data>>,
-  "columns"
-> & {
+export type SubmissionsTableProps<Data extends object = JSONRecord> = Omit<TableProps<SubmissionType<Data>>, "columns"> & {
   form?: FormType;
 };
 
-export function SubmissionsTable<Data extends { [key: string]: JSON } = { [key: string]: JSON }>({
-  form,
-  ...props
-}: SubmissionsTableProps<Data>) {
-  const columns: any[] | undefined = form && mapFormToColumns(form);
+export function SubmissionsTable<Data extends object = JSONRecord>({ form, ...props }: SubmissionsTableProps<Data>) {
+  const columns: any[] | undefined = form && mapFormToColumns({ form: form });
 
   return <Table {...(props as any)} columns={columns!} />;
 }

package/src/organisms/views/FormViews.tsx

@@ -1,5 +1,6 @@
 import { useI18n } from "../../hooks/useI18n.js";
-import type { FormOptions, FormType, JSON, PermissionsResolver } from "../../interfaces/index.js";
+import type { FormOptions, FormType, PermissionsResolver } from "../../interfaces/index.js";
+import type { JSONRecord } from "../../interfaces/JSONRecord.js";
 import type { Tab as DefaultTab } from "../../molecules/tabs/Tab.js";
 import type { TabList as DefaultTabList } from "../../molecules/tabs/TabList.js";
 import type { TabPanel as DefaultTabPanel } from "../../molecules/tabs/TabPanel.js";
@@ -14,7 +15,7 @@ import { FormSettings } from "../form/settings/FormSettings.js";
 import { ActionsTable, type ActionsTableProps } from "../table/actions/ActionsTable.js";
 import { SubmissionsTable, type SubmissionsTableProps } from "../table/submissions/SubmissionsTable.js";
 
-export type FormViewsProps<Data extends { [key: string]: JSON } = { [key: string]: JSON }> = {
+export type FormViewsProps<Data extends object = JSONRecord> = {
   form: FormEditProps["form"];
   submissions: SubmissionsTableProps<Data>["data"];
   availableActions: ActionsTableProps["availableActions"];
@@ -25,9 +26,7 @@ export type FormViewsProps<Data extends { [key: string]: JSON } = { [key: string
   permissionsResolver?: PermissionsResolver<Data>;
 };
 
-function useSubmissionsOperations<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(
-  permissionsResolver?: PermissionsResolver<Data>
-) {
+function useSubmissionsOperations<Data extends object = JSONRecord>(permissionsResolver?: PermissionsResolver<Data>) {
   return [
     {
       title: "Edit",
@@ -45,9 +44,7 @@ function useSubmissionsOperations<Data extends { [key: string]: JSON } = { [key:
   ] as SubmissionsTableProps<Data>["operations"];
 }
 
-function useActionsOperations<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(
-  permissionsResolver?: PermissionsResolver<Data>
-) {
+function useActionsOperations<Data extends object = JSONRecord>(permissionsResolver?: PermissionsResolver<Data>) {
   return [
     {
       title: "Edit",
@@ -65,7 +62,7 @@ function useActionsOperations<Data extends { [key: string]: JSON } = { [key: str
   ] as SubmissionsTableProps<Data>["operations"];
 }
 
-export function FormViews<Data extends { [key: string]: JSON } = { [key: string]: JSON }>({
+export function FormViews<Data extends object = JSONRecord>({
   form,
   roles,
   availableActions,

package/dist/interfaces/QueryOptions.d.ts

@@ -1,23 +0,0 @@
-import { ColumnIdentifier } from './ColumnIdentifier';
-export type QueryOptions = {
-    /**
-     * Current displayed page
-     */
-    pageIndex: any;
-    /**
-     * Pagination size
-     */
-    pageSize: any;
-    /**
-     * SortBy state
-     */
-    sortBy: ColumnIdentifier[];
-    /**
-     * Filters state
-     */
-    filters: ColumnIdentifier[];
-    /**
-     * Focused input filter (let the Table component retrieve focus state when we fill the filter)
-     */
-    filterId: string;
-};

package/dist/interfaces/QueryOptions.js

@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=QueryOptions.js.map

package/dist/interfaces/QueryOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryOptions.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/src/interfaces/QueryOptions.ts

@@ -1,24 +0,0 @@
-import { ColumnIdentifier } from "./ColumnIdentifier";
-
-export type QueryOptions = {
-  /**
-   * Current displayed page
-   */
-  pageIndex: any;
-  /**
-   * Pagination size
-   */
-  pageSize: any;
-  /**
-   * SortBy state
-   */
-  sortBy: ColumnIdentifier[];
-  /**
-   * Filters state
-   */
-  filters: ColumnIdentifier[];
-  /**
-   * Focused input filter (let the Table component retrieve focus state when we fill the filter)
-   */
-  filterId: string;
-};