Skip to content

Commit

Permalink
fix(react-formio): use @formio/js v5+
Browse files Browse the repository at this point in the history
  • Loading branch information
Romakita committed Jan 2, 2025
1 parent 43742f1 commit 23d8d72
Show file tree
Hide file tree
Showing 47 changed files with 222 additions and 275 deletions.
2 changes: 1 addition & 1 deletion .storybook/styles/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "tailwind.css";
@import "fonts/index.css";
@import "typography.css";
@import "../../node_modules/formiojs/dist/formio.full.css";
@import "../../node_modules/@formio/js/dist/formio.full.css";
@import "../../packages/tailwind-formio/styles/index.css";

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
},
"dependencies": {
"@formio/choices.js": "^9.0.1",
"@formio/js": "5.0.0",
"@types/classnames": "^2.2.11",
"@types/react": "^18.2.8",
"@types/react-dnd": "3.0.2",
Expand All @@ -45,7 +46,6 @@
"@types/react-router-dom": "^5.3.3",
"@types/react-table": "^7.7.14",
"connected-react-router": "6.9.1",
"formiojs": "4.21.6",
"history": "5.3.0",
"lerna": "8.1.2",
"lodash": "4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion packages/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"peerDependencies": {
"@formio/choices.js": ">=9.0.1",
"formiojs": ">=4.0.0",
"@formio/js": ">=5.0.0",
"lodash": ">=4.17.20",
"react": ">=16.14.0",
"react-dnd": ">=16.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/integration/src/styles/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "tailwind.css";
@import "fonts/index.css";
@import "typography.css";
@import "formiojs/dist/formio.full.css";
@import "@formio/js/dist/formio.full.css";
@import "@tsed/tailwind-formio/styles/index.css";

8 changes: 4 additions & 4 deletions packages/react-formio-container/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
"peerDependencies": {
"@formio/choices.js": "^9.0.1",
"@formio/js": "^5.0.0",
"@tsed/react-formio": "3.0.0-alpha.1",
"@tsed/react-formio-stores": "3.0.0-alpha.1",
"classnames": "^2.3.1",
"connected-react-router": "^6.9.1",
"file-saver": "^2.0.5",
"formiojs": "^4.21.6",
"lodash": "^4.17.21",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand All @@ -52,6 +52,9 @@
"vitest": "2.1.8"
},
"peerDependenciesMeta": {
"@formio/js": {
"optional": false
},
"choices.js": {
"optional": false
},
Expand All @@ -64,9 +67,6 @@
"file-saver": {
"optional": false
},
"formiojs": {
"optional": false
},
"lodash": {
"optional": false
},
Expand Down
1 change: 0 additions & 1 deletion packages/react-formio-container/src/react-app-env.d.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/react-formio-stores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"peerDependencies": {
"@formio/choices.js": ">=9.0.1",
"formiojs": ">=4.0.0",
"@formio/js": ">=5.0.0",
"lodash": ">=4.17.20",
"react": ">=16.14.0",
"react-dom": ">=16.14.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { getActionInfo, receiveActionInfo, requestActionInfo } from "./action-info.actions";

vi.mock("formiojs", async (originalImport) => {
vi.mock("@formio/js", async (originalImport) => {
return {
...(await originalImport()),
Formio: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Formio } from "@formio/js";
import { createAction } from "@tsed/redux-utils";
import { Formio } from "formiojs";
import noop from "lodash/noop";

import { getFormUrl } from "../../utils/url";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { getActionInfo } from "../action-info";
import {
Expand All @@ -12,7 +12,7 @@ import {
sendAction
} from "./action.actions";

vi.mock("formiojs", async (originalImport) => {
vi.mock("@formio/js", async (originalImport) => {
return {
...(await originalImport()),
Formio: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Formio } from "@formio/js";
import { createAction } from "@tsed/redux-utils";
import { Formio } from "formiojs";
import get from "lodash/get";
import noop from "lodash/noop";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { getActions, receiveActions, requestActions, resetActions } from "./actions.actions";

vi.mock("formiojs", async (originalImport) => {
vi.mock("@formio/js", async (originalImport) => {
return {
...(await originalImport()),
Formio: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Formio } from "@formio/js";
import { createAction } from "@tsed/redux-utils";
import { Formio } from "formiojs";
import noop from "lodash/noop";

import { getFormUrl } from "../../utils/url";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { formAccessUser, submissionAccessUser, userForms, userRoles } from "./auth.actions";
import { AUTH } from "./auth.constant";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Formio } from "@formio/js";
import type { FormSchema, RoleSchema } from "@tsed/react-formio";
import { Formio } from "formiojs";

import { formAccessUser, submissionAccessUser, userForms, userRoles } from "./auth.actions";
import { AUTH } from "./auth.constant";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { projectAccessUser } from "./auth.actions";
import { AUTH } from "./auth.constant";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { requestUser } from "./auth.actions";
import { AUTH } from "./auth.constant";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";
import noop from "lodash/noop";

import { failUser, requestUser } from "./auth.actions";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { logoutUser } from "./auth.actions";
import { AUTH } from "./auth.constant";
import { logout } from "./logout.action";

vi.mock("./auth.actions");
vi.mock("formiojs");
vi.mock("@formio/js");

describe("logout()", () => {
beforeEach(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { logoutUser } from "./auth.actions";
import { AUTH } from "./auth.constant";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { receiveUser } from "./auth.actions";
import { AUTH } from "./auth.constant";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { receiveUser } from "./auth.actions";
import { AUTH } from "./auth.constant";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { deleteForm, failForm, getForm, receiveForm, requestForm, resetForm, saveForm, sendForm } from "./form.actions";

vi.mock("formiojs", async (originalImport) => {
vi.mock("@formio/js", async (originalImport) => {
return {
...(await originalImport()),
Formio: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Formio } from "@formio/js";
import type { FormSchema } from "@tsed/react-formio";
import { createAction } from "@tsed/redux-utils";
import { Formio } from "formiojs";
import noop from "lodash/noop";

import { getFormUrl } from "../../utils/url";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { mapRequestParams } from "../../utils/mapRequestParams";
import { failForms, getForms, receiveForms, requestForms } from "./forms.actions";

vi.mock("formiojs", async (originalImport) => {
vi.mock("@formio/js", async (originalImport) => {
return {
...(await originalImport()),
Formio: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Formio } from "@formio/js";
import type { FormSchema } from "@tsed/react-formio";
import { createAction } from "@tsed/redux-utils";
import { Formio } from "formiojs";
import noop from "lodash/noop";

import { mapRequestParams, RequestParamsOptions } from "../../utils/mapRequestParams";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import {
clearSubmissionError,
Expand All @@ -12,7 +12,7 @@ import {
sendSubmission
} from "./submission.actions";

vi.mock("formiojs", async (originalImport) => {
vi.mock("@formio/js", async (originalImport) => {
return {
...(await originalImport()),
Formio: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Formio } from "@formio/js";
import { Submission } from "@tsed/react-formio";
import { createAction } from "@tsed/redux-utils";
import { Formio } from "formiojs";
import noop from "lodash/noop";

import { getSubmissionUrl } from "../../utils/url";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Formio } from "formiojs";
import { Formio } from "@formio/js";

import { mapRequestParams } from "../../utils/mapRequestParams";
import { failSubmissions, getSubmissions, receiveSubmissions, requestSubmissions } from "./submissions.actions";

vi.mock("formiojs", async (originalImport) => {
vi.mock("@formio/js", async (originalImport) => {
return {
...(await originalImport()),
Formio: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Formio } from "@formio/js";
import { createAction } from "@tsed/redux-utils";
import { Formio } from "formiojs";
import noop from "lodash/noop";

import { mapRequestParams } from "../../utils/mapRequestParams";
Expand Down
2 changes: 1 addition & 1 deletion packages/react-formio-stores/src/utils/url.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Formio, Utils } from "formiojs";
import { Formio, Utils } from "@formio/js";

export function getFormUrl(formId: string): string {
const url = [Formio.getProjectUrl()];
Expand Down
2 changes: 1 addition & 1 deletion packages/react-formio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"peerDependencies": {
"@formio/choices.js": ">=9.0.1",
"formiojs": ">=4.0.0",
"@formio/js": ">=5.0.0",
"lodash": ">=4.17.20",
"moment": ">=2.30.1",
"react": ">=16.14.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ExtendedComponentSchema } from "formiojs";
import { ExtendedComponentSchema } from "@formio/js";

import { FormSchema } from "../../interfaces/FormSchema";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ExtendedComponentSchema } from "formiojs";
import { ExtendedComponentSchema } from "@formio/js";
import cloneDeep from "lodash/cloneDeep";
import isEqual from "lodash/isEqual";
import noop from "lodash/noop";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import FormioUtils from "formiojs/utils";
import FormioUtils from "@formio/js/utils";
import { PropsWithChildren, ReactElement } from "react";

import { ActionDefaultsSchema, ActionSchema, FormOptions, Submission } from "../../interfaces";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { ComponentSchema } from "formiojs";
import AllComponents from "formiojs/components";
import Components from "formiojs/components/Components";
import FormioFormBuilder from "formiojs/FormBuilder";
import { Component as FormComponent } from "@formio/core";
import { FormBuilder as FormioFormBuilder } from "@formio/js";
import cloneDeep from "lodash/cloneDeep";
import noop from "lodash/noop";
import { Component } from "react";

import { callLast } from "../../utils/callLast";

Components.setComponents(AllComponents);
/**
* @deprecated use Component from @formio/core
*/
export type ComponentSchema = FormComponent;

const EVENTS = [
"addComponent",
Expand All @@ -25,7 +26,7 @@ const EVENTS = [

const EVENTS_CHANGE = ["addComponent", "saveComponent", "updateComponent", "removeComponent"];

async function createBuilder(el: Element, { components = [], display, options, onChange, events = {} }: any): Promise<void> {
async function createBuilder(el: HTMLElement, { components = [], display, options, onChange, events = {} }: any): Promise<void> {
const form = {
display,
components: [...components]
Expand Down Expand Up @@ -53,11 +54,11 @@ async function createBuilder(el: Element, { components = [], display, options, o
}

export interface FormBuilderProps {
components: ComponentSchema[];
components: FormComponent[];
display?: string;
options?: any;
builder?: any;
onChange?: (components: ComponentSchema[]) => void;
onChange?: (components: FormComponent[]) => void;
onAddComponent?: Function;
onUpdateComponent?: Function;
onRemoveComponent?: Function;
Expand Down
5 changes: 0 additions & 5 deletions packages/react-formio/src/components/form/form.component.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { Components } from "formiojs";
import AllComponents from "formiojs/components";

import { useForm, UseFormHookProps } from "./useForm.hook";

Components.setComponents(AllComponents);

export interface FormProps<Data = any> extends UseFormHookProps<Data> {
name?: string;
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/react-formio/src/components/form/useForm.hook.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ExtendedComponentSchema, Form } from "formiojs";
import { ExtendedComponentSchema, Form } from "@formio/js";
import cloneDeep from "lodash/cloneDeep";
import isEqual from "lodash/isEqual";
import { useEffect, useRef } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Components, ExtendedComponentSchema } from "formiojs";
import FormioUtils from "formiojs/utils";
import { Components, ExtendedComponentSchema } from "@formio/js";
import FormioUtils from "@formio/js/utils";

import { FormSchema } from "../../../interfaces";
import { DefaultCell } from "../components/defaultCell.component";
Expand Down
Loading

0 comments on commit 23d8d72

Please sign in to comment.