@digigov/form 0.10.6 → 0.10.7

package/{inputs → dist/inputs}/Radio/index.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireDefault(require("react"));
 
-var _Radio = _interopRequireDefault(require("@digigov/react-core/Radio"));
+var _RadioContainer = _interopRequireDefault(require("@digigov/react-core/RadioContainer"));
 
 var _RadioItem = _interopRequireDefault(require("@digigov/react-core/RadioItem"));
 
@@ -42,7 +42,7 @@ var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
   var _useTranslation = (0, _i18n.useTranslation)(),
       t = _useTranslation.t;
 
-  return /*#__PURE__*/_react["default"].createElement(_Radio["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_RadioContainer["default"], {
     className: className,
     defaultValue: currentValue,
     id: name

package/{inputs → dist/inputs}/Select/index.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireDefault(require("react"));
 
-var _Select = _interopRequireDefault(require("@digigov/react-core/Select"));
+var _SelectContainer = _interopRequireDefault(require("@digigov/react-core/SelectContainer"));
 
 var _SelectOption = _interopRequireDefault(require("@digigov/react-core/SelectOption"));
 
@@ -26,7 +26,7 @@ var Select = /*#__PURE__*/_react["default"].forwardRef(function WrappedSelect(_r
       className = _ref$extra.className,
       disabled = _ref.disabled,
       props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  return /*#__PURE__*/_react["default"].createElement(_Select["default"], (0, _extends2["default"])({
+  return /*#__PURE__*/_react["default"].createElement(_SelectContainer["default"], (0, _extends2["default"])({
     className: className,
     ref: ref,
     name: name,

package/dist/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "@digigov/form",
+  "version": "0.10.7",
+  "description": "@digigov form builder",
+  "author": "GRNET Developers <devs@lists.grnet.gr>",
+  "license": "BSD-2-Clause",
+  "main": "./index.js",
+  "module": "./esm/index.js",
+  "publishConfig": {
+    "access": "public",
+    "directory": "dist"
+  },
+  "dependencies": {
+    "react-hook-form": "7.33.1",
+    "yup": "0.32.11",
+    "google-libphonenumber": "3.2.8",
+    "dayjs": "1.10.4",
+    "@hookform/resolvers": "2.9.6"
+  },
+  "peerDependencies": {
+    "@digigov/ui": "0.28.2",
+    "@digigov/react-core": "0.18.0",
+    "@digigov/react-extensions": "0.20.0",
+    "clsx": "1.1.1",
+    "react": "^16.8.0 || ^17.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0"
+  },
+  "gitHead": "c903a46306f77f55ad7fc4d2e274006f39a6c871",
+  "private": false,
+  "typings": "./index.d.ts"
+}

package/{registry.d.ts → dist/registry.d.ts}

@@ -1,7 +1,7 @@
 declare var _default: {
     '@digigov/form/Field/FieldBase': {};
+    '@digigov/form/Field/FieldBaseContainer': {};
     '@digigov/form/Field/FieldConditional': {};
-    '@digigov/form/Field/FieldContainer': {};
     '@digigov/form/Field': {};
     '@digigov/form/Field/types': {};
     '@digigov/form/Field/utils': {};

package/{registry.js → dist/registry.js}

@@ -9,9 +9,9 @@ exports["default"] = void 0;
 
 var _digigov_form_Field_FieldBase = _interopRequireWildcard(require("@digigov/form/Field/FieldBase"));
 
-var _digigov_form_Field_FieldConditional = _interopRequireWildcard(require("@digigov/form/Field/FieldConditional"));
+var _digigov_form_Field_FieldBaseContainer = _interopRequireWildcard(require("@digigov/form/Field/FieldBaseContainer"));
 
-var _digigov_form_Field_FieldContainer = _interopRequireWildcard(require("@digigov/form/Field/FieldContainer"));
+var _digigov_form_Field_FieldConditional = _interopRequireWildcard(require("@digigov/form/Field/FieldConditional"));
 
 var _digigov_form_Field = _interopRequireWildcard(require("@digigov/form/Field"));
 
@@ -139,8 +139,8 @@ function lazyImport(pkgImport) {
 
 var _default = {
   '@digigov/form/Field/FieldBase': lazyImport(_digigov_form_Field_FieldBase),
+  '@digigov/form/Field/FieldBaseContainer': lazyImport(_digigov_form_Field_FieldBaseContainer),
   '@digigov/form/Field/FieldConditional': lazyImport(_digigov_form_Field_FieldConditional),
-  '@digigov/form/Field/FieldContainer': lazyImport(_digigov_form_Field_FieldContainer),
   '@digigov/form/Field': lazyImport(_digigov_form_Field),
   '@digigov/form/Field/types': lazyImport(_digigov_form_Field_types),
   '@digigov/form/Field/utils': lazyImport(_digigov_form_Field_utils),

package/docs/index.mdx

@@ -0,0 +1,6 @@
+---
+title: DigiGOV Form
+order: 0
+---
+
+# DigiGOV Authentication client

package/form.build.log

@@ -0,0 +1,16 @@
+Invoking: digigov build --subpackages 
+Running  /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/node_modules/.bin/rimraf dist
+Running  /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/node_modules/.bin/tsc --emitDeclarationOnly --outDir dist --project /Users/dimitristsironis/grnet/digigov-sdk/libs/form/tsconfig.production.json
+Running  /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/node_modules/.bin/babel --config-file /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/babel.config.js src --extensions .tsx,.ts,.js,.jsx --copy-files --out-dir dist/esm
+Successfully compiled 95 files with Babel (2416ms).
+Running  /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/node_modules/.bin/babel --config-file /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/babel.config.js src --extensions .tsx,.ts,.js,.jsx --copy-files --out-dir dist/es
+Successfully compiled 95 files with Babel (2177ms).
+Created package.json in /Users/dimitristsironis/grnet/digigov-sdk/libs/form/dist/package.json
+Copied /Users/dimitristsironis/grnet/digigov-sdk/libs/form/CHANGELOG.md to /Users/dimitristsironis/grnet/digigov-sdk/libs/form/dist/CHANGELOG.md
+Copied /Users/dimitristsironis/grnet/digigov-sdk/libs/form/README.md to /Users/dimitristsironis/grnet/digigov-sdk/libs/form/dist/README.md
+Copied /Users/dimitristsironis/grnet/digigov-sdk/LICENSE to /Users/dimitristsironis/grnet/digigov-sdk/libs/form/dist/LICENSE
+Skipped license for ./umd/digigov-ui.development.js
+Skipped license for ./umd/digigov-ui.production.min.js
+Skipped license for ./index.js
+Running  /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/node_modules/.bin/babel --config-file /Users/dimitristsironis/grnet/digigov-sdk/tooling/cli-build/babel.config.js src --extensions .tsx,.ts,.js,.jsx --copy-files --out-dir dist
+Successfully compiled 95 files with Babel (2407ms).

package/package.json

@@ -1,15 +1,21 @@
 {
   "name": "@digigov/form",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "description": "@digigov form builder",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
-  "main": "./index.js",
-  "module": "./esm/index.js",
+  "main": "dist/index.js",
+  "module": "index.js",
   "publishConfig": {
     "access": "public",
     "directory": "dist"
   },
+  "scripts": {
+    "lint": "digigov lint",
+    "test": "digigov test",
+    "build": "digigov build --subpackages",
+    "prepublish": "digigov build --subpackages"
+  },
   "dependencies": {
     "react-hook-form": "7.33.1",
     "yup": "0.32.11",
@@ -18,14 +24,29 @@
     "@hookform/resolvers": "2.9.6"
   },
   "peerDependencies": {
-    "@digigov/ui": "0.28.1",
-    "@digigov/react-core": "0.17.2",
-    "@digigov/react-extensions": "0.19.1",
+    "@digigov/ui": "0.28.2",
+    "@digigov/react-core": "0.18.0",
+    "@digigov/react-extensions": "0.20.0",
     "clsx": "1.1.1",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
-  "gitHead": "c903a46306f77f55ad7fc4d2e274006f39a6c871",
-  "private": false,
-  "typings": "./index.d.ts"
-}
+  "devDependencies": {
+    "@digigov/cli": "0.6.3",
+    "@digigov/cli-lint": "0.5.32",
+    "@digigov/cli-build": "0.8.3",
+    "@digigov/cli-test": "0.7.2",
+    "typescript": "4.2.3",
+    "@types/node": "16.6.2",
+    "@types/react": "16.9.56",
+    "@types/react-dom": "16.9.9",
+    "@types/enzyme": "3.10.8",
+    "@types/enzyme-adapter-react-16": "1.0.5",
+    "@types/jest": "26.0.15",
+    "enzyme": "3.11.0",
+    "eslint": "7.24.0",
+    "prettier": "2.2.1",
+    "@hookform/devtools": "4.2.0"
+  },
+  "gitHead": "c903a46306f77f55ad7fc4d2e274006f39a6c871"
+}

package/src/Field/FieldBase.tsx

@@ -0,0 +1,99 @@
+import React from 'react';
+import FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';
+import { FieldBaseProps } from '@digigov/form/Field/types';
+import { Controller } from 'react-hook-form';
+
+export const FieldBase: React.FC<FieldBaseProps> = (props) => {
+  const {
+    required,
+    name,
+    component: Component,
+    wrapper,
+    control,
+    type,
+    controlled = false,
+    enabled = true,
+    editable,
+    defaultValue,
+    label,
+    extra = {},
+    layout,
+    error,
+    register,
+    ...componentProps
+  } = props;
+  if (!enabled) {
+    return null;
+  }
+  if (controlled) {
+    return (
+      <FieldBaseContainer
+        label={label}
+        layout={layout}
+        error={error}
+        wrapper={wrapper}
+        name={name}
+      >
+        <Controller
+          control={control}
+          name={name}
+          render={({ field }) => {
+            return (
+              <Component
+                {...field}
+                defaultValue={defaultValue}
+                extra={extra}
+                error={!!error}
+                type={type}
+                aria-required={!!required}
+                aria-describedby={error && `${name}-error`}
+                required={required}
+                disabled={editable === false}
+                {...componentProps}
+              />
+            );
+          }}
+        />
+      </FieldBaseContainer>
+    );
+  }
+
+  return (
+    <FieldBaseContainer
+      label={label}
+      layout={layout}
+      error={error}
+      wrapper={wrapper}
+      name={name}
+    >
+      {Component?.render ? (
+        <Component
+          {...register(name)}
+          control={control}
+          error={!!error}
+          extra={extra}
+          type={type}
+          aria-required={!!required}
+          aria-describedby={error && `${name}-error`}
+          required={required}
+          disabled={editable === false}
+          {...componentProps}
+        />
+      ) : (
+        <Component
+          {...register(name)}
+          register={register}
+          control={control}
+          error={!!error}
+          extra={extra}
+          type={type}
+          aria-required={!!required}
+          aria-describedby={error && `${name}-error`}
+          required={required}
+          disabled={editable === false}
+          {...componentProps}
+        />
+      )}
+    </FieldBaseContainer>
+  );
+};

package/src/Field/FieldBaseContainer.tsx

@@ -0,0 +1,57 @@
+import React from 'react';
+import FieldContainer from '@digigov/react-core/FieldContainer';
+import LabelContainer from '@digigov/react-core/LabelContainer';
+import CoreFieldset from '@digigov/react-core/Fieldset';
+import Hint from '@digigov/react-core/Hint';
+import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
+import ErrorMessage from '@digigov/react-core/ErrorMessage';
+import { useTranslation } from '@digigov/ui/app/i18n';
+import { FieldContainerProps } from '@digigov/form/Field/types';
+import Label from '@digigov/form/inputs/Label';
+
+export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
+  name,
+  wrapper,
+  label,
+  children,
+  error,
+  layout,
+}) => {
+  const { t } = useTranslation();
+  const errorMessage = error?.message.key
+    ? error.message.key
+    : error?.message || '';
+  const errorContext = error?.message.context || {};
+  if (wrapper === 'fieldset') {
+    return (
+      <FieldContainer error={!!error} {...layout}>
+        <CoreFieldset>
+          <FieldsetLegend size="s">{label && label.primary}</FieldsetLegend>
+          {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}
+          {error && (
+            <ErrorMessage id={`${name}-error`}>
+              {t(errorMessage, errorContext)}
+            </ErrorMessage>
+          )}
+          {children}
+        </CoreFieldset>
+      </FieldContainer>
+    );
+  } else {
+    return (
+      <FieldContainer error={!!error} {...layout}>
+        <LabelContainer>
+          {label && <Label label={label} />}
+          {error && (
+            <ErrorMessage id={`${name}-error`}>
+              {t(errorMessage, errorContext)}
+            </ErrorMessage>
+          )}
+          {children}
+        </LabelContainer>
+      </FieldContainer>
+    );
+  }
+};
+
+export default FieldBaseContainer;

package/src/Field/FieldConditional.tsx

@@ -0,0 +1,75 @@
+import React from 'react';
+import { useWatch } from 'react-hook-form';
+import { evaluateFieldWithConditions } from '@digigov/form/Field/utils';
+import { FieldBase } from '@digigov/form/Field/FieldBase';
+import {
+  ChildFieldMemoProps,
+  FieldConditionalProps,
+} from '@digigov/form/Field/types';
+
+const ChildFieldMemo = React.memo(
+  function ChildField({
+    dependencies,
+    field,
+    control,
+    reset,
+    register,
+    error,
+  }: ChildFieldMemoProps) {
+    const newField = evaluateFieldWithConditions(
+      field,
+      dependencies as FormData
+    );
+    return (
+      <FieldBase
+        {...newField}
+        name={newField.key}
+        reset={reset}
+        control={control}
+        register={register}
+        error={error}
+      />
+    );
+  },
+  (prev, next) => {
+    if (!prev || !prev.dependencies) {
+      return false;
+    }
+    if (prev.error !== next.error) {
+      return false;
+    }
+    for (const dep in next.dependencies) {
+      if (next.dependencies[dep] !== prev.dependencies[dep]) {
+        return false;
+      }
+    }
+    return true;
+  }
+);
+
+export const FieldConditional: React.FC<FieldConditionalProps> = ({
+  control,
+  field,
+  register,
+  reset,
+  error,
+}) => {
+  const dependencyKeys = Object.keys(field.condition);
+  const variables = useWatch({
+    name: dependencyKeys,
+    control,
+  });
+
+  return (
+    <ChildFieldMemo
+      dependencies={variables}
+      field={field}
+      control={control}
+      register={register}
+      reset={reset}
+      error={error}
+    />
+  );
+};
+
+export default FieldConditional;

package/src/Field/index.mdx

@@ -0,0 +1,6 @@
+---
+title: Form
+parent: docs/form/components
+---
+
+hello md