Version 7.0.0 (autocommit)

Author: optimajet

community/src/lerna.json

@@ -2,5 +2,5 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
   "useWorkspaces": true,
-  "version": "6.2.1"
+  "version": "7.0.0"
 }

community/src/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-form-builder/example-viewer",
-  "version": "6.2.1",
+  "version": "7.0.0",
   "license": "MIT",
   "private": true,
   "main": "src/index.tsx",
@@ -21,8 +21,8 @@
     "dev": "vite -c ../../../vite.config.ts --host"
   },
   "dependencies": {
-    "@react-form-builder/components-rsuite": "^6.2.1",
-    "@react-form-builder/core": "^6.2.1",
+    "@react-form-builder/components-rsuite": "^7.0.0",
+    "@react-form-builder/core": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },

community/src/packages/apps/example-viewer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-form-builder/core",
   "description": "React hook form alternative.",
-  "version": "6.2.1",
+  "version": "7.0.0",
   "license": "MIT",
   "private": false,
   "author": "Optimajet",

community/src/packages/core/package.json

@@ -15,7 +15,4 @@ export const screenMeta = new Meta(
   screenStyleProperties,
   [],
   modules,
-  undefined,
-  undefined,
-  'container'
 )

community/src/packages/core/src/features/components/screenMeta.tsx

@@ -9,18 +9,7 @@ import type {ActionDefinition, ActionEventHandler, DefineActionHelper, EventName
  */
 export type ActionsInitializer = (props: ComponentStore['props'], def: DefineActionHelper) => Record<EventName, ActionEventHandler | ActionDefinition>
 
-/**
- * @deprecated Use the built-in 'slot' component.
- */
-export type DeprecatedSlotComponentKind = 'slot'
-
-/**
- * @deprecated Use the {@link definePreset} function instead.
- */
-export type DeprecatedPresetComponentKind = 'preset'
-
 /**
  * The component kind type.
  */
 export type ComponentKind = 'container' | 'component' | 'template' | 'repeater'
-  | DeprecatedSlotComponentKind | DeprecatedPresetComponentKind

community/src/packages/core/src/features/define/types.ts

@@ -1,4 +1,3 @@
-import type {Annotation} from '../../annotation/types/annotations/Annotation'
 import {internalErrorMeta} from '../../components/internalErrorMeta'
 import {screenMeta} from '../../components/screenMeta'
 import {modalMeta} from '../../modal/modalMeta'
@@ -23,8 +22,6 @@ const modalCategoryName = 'modal'
  */
 export class BuilderView extends View {
   #metaMap = new Map<string, Meta>()
-  #tooltipsMeta = new Map<string, Meta>()
-  #errorMeta = new Map<string, Meta>()
 
   /**
    * The function for filtering components on the component palette.
@@ -68,68 +65,6 @@ export class BuilderView extends View {
     return this.#metaMap.get(type)
   }
 
-  /**
-   * @deprecated
-   * Returns the array of metadata properties of the tooltip component.
-   * @param name the name of the tooltip component type.
-   * @returns the array of metadata properties of the tooltip component.
-   */
-  getTooltipAnnotations(name: string): Annotation[] | undefined {
-    return this.#tooltipsMeta.get(name)?.properties
-  }
-
-  /**
-   * @deprecated
-   * Returns the array of metadata properties of the error component.
-   * @param name the name of the error component type.
-   * @returns the array of metadata properties of the error component.
-   */
-  getErrorAnnotations(name: string): Annotation[] | undefined {
-    return this.#errorMeta.get(name)?.properties
-  }
-
-  /**
-   * @deprecated
-   * @returns the array of strings with the names of the component types of the tooltip.
-   */
-  get tooltips() {
-    return Array.from(this.#tooltipsMeta.keys())
-  }
-
-  /**
-   * @deprecated
-   * @returns the array of strings with the names of the component types of the error.
-   */
-  get errors() {
-    return Array.from(this.#errorMeta.keys())
-  }
-
-  /**
-   * @deprecated use the {@link Definer.componentRole}('tooltip') instead.
-   * Sets the metadata of the component that displays the form's tooltips.
-   * @param builderComponent the metadata of the component that displays the form's tooltips.
-   * @returns the instance of the {@link BuilderView} class.
-   */
-  withTooltipMeta(builderComponent: BuilderComponent): this {
-    const {model, meta} = builderComponent
-    this.define(model)
-    this.#tooltipsMeta.set(model.type, meta)
-    return this
-  }
-
-  /**
-   * @deprecated use the {@link Definer.componentRole}('error-message') instead.
-   * Sets the metadata of the component that displays form's errors.
-   * @param builderComponent the metadata of the component that displays the form's errors.
-   * @returns the instance of the {@link BuilderView} class.
-   */
-  withErrorMeta(builderComponent: BuilderComponent): this {
-    const {model, meta} = builderComponent
-    this.define(model)
-    this.#errorMeta.set(model.type, meta)
-    return this
-  }
-
   /**
    * Creates metadata for the form builder for templates from the specified template names.
    * @param templates the array of template names.

community/src/packages/core/src/features/define/utils/BuilderView.ts

@@ -118,7 +118,6 @@ export class Definer<T extends object> {
     if (!name) throw Error('Anonymous components are not allowed!')
     const PresetComponent = () => null
     const definer = new Definer(PresetComponent)
-      .kind('preset')
       .addFeature(cfComponentIsPreset, true)
       .type(name)
       .name(name)
@@ -325,7 +324,6 @@ export class Definer<T extends object> {
       modules,
       this.data.customPreview,
       valuedAn,
-      this.data.kind,
       this.data.initialJson,
       this.data.eventListeners,
       this.data.icon,

community/src/packages/core/src/features/define/utils/Definer.ts

@@ -1,6 +1,5 @@
 import type {ComponentType, ReactNode} from 'react'
 import type {Annotation} from '../../annotation/types/annotations/Annotation'
-import type {ComponentKind} from '../types'
 import type {ComponentMetadataEventListeners} from './ComponentMetadataEventListeners'
 import type {InsertRestrictionFn} from './InsertRestrictionFn'
 
@@ -9,11 +8,6 @@ import type {InsertRestrictionFn} from './InsertRestrictionFn'
  */
 export class Meta {
 
-  /**
-   * @deprecated the component kind. Use the {@link Model.kind}.
-   */
-  readonly kind: ComponentKind
-
   /**
    * Creates the component metadata for the form builder.
    * @param type the component type name.
@@ -23,7 +17,6 @@ export class Meta {
    * @param modules common metadata for the component.
    * @param customPreview the custom ReactNode to be drawn on the toolbar.
    * @param valuedAn the metadata for the component value.
-   * @param kind the component kind.
    * @param initialJson the JSON source for the component (instance of {@link ComponentStore} class serialised to JSON).
    * @param eventListeners the component metadata event listeners.
    * @param icon the component icon.
@@ -37,12 +30,10 @@ export class Meta {
     readonly modules: Annotation[],
     readonly customPreview?: ReactNode,
     readonly valuedAn?: Annotation,
-    kind: ComponentKind = 'component',
     readonly initialJson?: string,
     readonly eventListeners?: ComponentMetadataEventListeners,
     readonly icon?: ComponentType,
     readonly insertRestriction?: InsertRestrictionFn,
   ) {
-    this.kind = kind
   }
 }

community/src/packages/core/src/features/define/utils/Meta.ts

@@ -15,8 +15,16 @@ export const commonActions: ActionValues = {
   }, {
     failOnError: 'boolean',
   }),
-  clear: ActionDefinition.functionalAction(e => e.store.form.componentTree.clear()),
-  reset: ActionDefinition.functionalAction(e => e.store.form.componentTree.reset()),
+  clear: ActionDefinition.functionalAction((e, args) => {
+    e.store.form.componentTree.clear(args.clearInitialData)
+  }, {
+    clearInitialData: 'boolean',
+  }),
+  reset: ActionDefinition.functionalAction((e, args) => {
+    e.store.form.componentTree.reset(args.clearInitialData)
+  }, {
+    clearInitialData: 'boolean',
+  }),
   addRow: addRowAction,
   removeRow: removeRowAction,
   openModal,