Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore]: update dependencies minor version #104

Merged
merged 9 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/admin/src/components/form/Builder/Builder.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ComponentSchema } from '@formio/js'
import type { ComponentSchema } from 'formiojs'
import dynamic from 'next/dynamic'

import type { FormioSchema } from '../../../types/formio'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.builder {
width: 100%;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ComponentSchema, ExtendedComponentSchema } from '@formio/js'
import type { ComponentSchema, ExtendedComponentSchema } from 'formiojs'
import { useState } from 'react'
import {
useRefresh,
Expand All @@ -16,6 +16,8 @@ import { filterAttributes } from '../../../utils/filterAttributes'
import { Builder } from '../Builder'
import { HiddenComponentsInput } from '../HiddenComponentsInput'

import styles from './CreateEditForm.module.css'

type CreateEditFormProps = {
isEditForm?: boolean
}
Expand Down Expand Up @@ -49,7 +51,9 @@ export const CreateEditForm = ({ isEditForm = false }: CreateEditFormProps) => {
<TextInput source="title" validate={required()} />
<TextInput source="display" defaultValue="wizard" hidden />
<HiddenComponentsInput value={builderJson} setInitialValue={setInitialValue} />
<Builder data={initialValue} onChange={onChange} />
<div className={styles.builder}>
<Builder data={initialValue} onChange={onChange} />
</div>
</SimpleForm>
)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ComponentSchema } from '@formio/js'
import type { ComponentSchema } from 'formiojs'
import { useEffect } from 'react'
import { TextInput } from 'react-admin'
import { useFormContext } from 'react-hook-form'
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/src/types/formio.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ComponentSchema } from '@formio/js'
import type { ComponentSchema } from 'formiojs'

// TODO: this schema should probably come from the backend
export type FormioSchema = {
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/src/utils/filterAttributes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ComponentSchema, ExtendedComponentSchema } from '@formio/js'
import type { ComponentSchema, ExtendedComponentSchema } from 'formiojs'

const textareaAllowed = ['label', 'description', 'key', 'type', 'input', 'autoExpand', 'showCharCount']
const panelAllowed = ['label', 'key', 'type', 'input', 'components']
Expand Down
2 changes: 1 addition & 1 deletion libs/formio/src/FormBuilder.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FormBuilder as FormioFormBuilder } from '@formio/react'

import '@formio/js/dist/formio.builder.min.css'
import 'formiojs/dist/formio.builder.min.css'

export const FormBuilder = (props: any) => <FormioFormBuilder {...props} />
Loading