@digigov/form 0.13.2 → 1.0.0-480e3d97

package/src/MultiplicityField/MultiplicityField.stories.js

@@ -2,7 +2,7 @@ import MultiplicityField from '@digigov/form/MultiplicityField';
 export default {
   title: 'Digigov Form/MultiplicityField',
   component: MultiplicityField,
-  displayName: 'MultiplicityField'
+  displayName: 'MultiplicityField',
 };
 export * from '@digigov/form/MultiplicityField/__stories__/Default';
 export * from '@digigov/form/MultiplicityField/__stories__/WithMinLength';

package/src/MultiplicityField/__stories__/Default.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, FieldSpec } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 const fields = [
   {

package/src/MultiplicityField/__stories__/PreviewDisplay.tsx

@@ -1,10 +1,4 @@
 import React from 'react';
-import Layout, { Content, Main } from '@digigov/ui/layouts/Basic/';
-import SummaryList, {
-  SummaryListItem,
-  SummaryListItemKey,
-  SummaryListItemValue,
-} from '@digigov/ui/core/SummaryList';
 import {
   Header,
   HeaderSection,
@@ -15,12 +9,18 @@ import {
   Paragraph,
   Card,
   CardHeading,
-  CardText,
+  CardContent,
   List,
   ListItem,
 } from '@digigov/ui';
+import SummaryList, {
+  SummaryListItem,
+  SummaryListItemKey,
+  SummaryListItemValue,
+} from '@digigov/ui/content/SummaryList';
 import GovGRFooter from '@digigov/ui/govgr/Footer';
 import GovGRLogo from '@digigov/ui/govgr/GovGRLogo';
+import Layout, { Content, Main } from '@digigov/ui/layouts/Basic/';
 
 const fields = [
   {
@@ -64,12 +64,12 @@ const fields = [
 export const PreviewDisplay = () => (
   <Layout>
     <Header>
-      <HeaderSection>
-        <HeaderContent>
+      <HeaderContent>
+        <HeaderSection>
           <GovGRLogo href="#" />
           <HeaderTitle>Πρότυπο-Αναφοράς</HeaderTitle>
-        </HeaderContent>
-      </HeaderSection>
+        </HeaderSection>
+      </HeaderContent>
     </Header>
     <Content>
       <Main>
@@ -82,7 +82,7 @@ export const PreviewDisplay = () => (
         </Paragraph>
         <Card variant="border" borderColor="dark">
           <CardHeading>Συνυπογράφοντας 1</CardHeading>
-          <CardText>
+          <CardContent>
             <SummaryList>
               {fields &&
                 fields.map((field, index) => {
@@ -94,11 +94,11 @@ export const PreviewDisplay = () => (
                   );
                 })}
             </SummaryList>
-          </CardText>
+          </CardContent>
         </Card>
         <Card variant="border" borderColor="dark">
           <CardHeading>Συνυπογράφοντας 2</CardHeading>
-          <CardText>
+          <CardContent>
             <SummaryList>
               {fields &&
                 fields.map((field, index) => {
@@ -110,20 +110,20 @@ export const PreviewDisplay = () => (
                   );
                 })}
             </SummaryList>
-          </CardText>
+          </CardContent>
         </Card>
         <Card variant="border" borderColor="dark">
           <CardHeading>Συνυπογράφοντας 3</CardHeading>
-          <CardText>
+          <CardContent>
             <SummaryList>
               <SummaryListItem>
                 <SummaryListItemKey>Όνομα</SummaryListItemKey>
                 <SummaryListItemValue>Μάριος</SummaryListItemValue>
               </SummaryListItem>
             </SummaryList>
-          </CardText>
+          </CardContent>
         </Card>
-        <Heading size="m">Στοιχεία Δήλωσης</Heading>
+        <Heading size="md">Στοιχεία Δήλωσης</Heading>
         <SummaryList>
           <SummaryListItem>
             <SummaryListItemKey>Όνομα</SummaryListItemKey>

package/src/MultiplicityField/__stories__/WithExactLength.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, FieldSpec } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 const fields = [
   {

package/src/MultiplicityField/__stories__/WithMaxLength.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, FieldSpec } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 const fields = [
   {

package/src/MultiplicityField/__stories__/WithMinAndMaxLength.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, FieldSpec } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 const fields = [
   {

package/src/MultiplicityField/__stories__/WithMinLength.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, FieldSpec } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 const fields = [
   {

package/src/MultiplicityField/add-objects.tsx

@@ -1,9 +1,6 @@
 /* eslint-disable react/prop-types */
 import React, { useEffect, useMemo } from 'react';
 // import { FormBuilderProps } from '@digigov/form';
-import Button from '@digigov/ui/core/Button';
-import Fieldset from '@digigov/react-core/Fieldset';
-import RadioConditional from '@digigov/react-core/RadioConditional';
 import {
   ErrorOption,
   FieldArrayWithId,
@@ -19,6 +16,9 @@ import {
   StashedObject,
 } from '@digigov/form/MultiplicityField';
 import { FieldSpec } from '@digigov/form/types';
+import Fieldset from '@digigov/react-core/Fieldset';
+import RadioConditional from '@digigov/react-core/RadioConditional';
+import Button from '@digigov/ui/form/Button';
 export interface AddObjectsProps
   extends Omit<MultiplicityProps, 'key' | 'component'> {
   fields: FieldArrayWithId[];

package/src/MultiplicityField/index.tsx

@@ -1,18 +1,18 @@
 import React, { useState } from 'react';
+import { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';
+import { FieldSpec } from '@digigov/form';
+import FieldContainer from '@digigov/form/Field/FieldBaseContainer';
 import { ControlledFieldProps } from '@digigov/form/Field/types';
+import FieldObject from '@digigov/form/FieldObject';
+import AddObjects from '@digigov/form/MultiplicityField/add-objects';
 import {
   Card,
-  CardText,
+  CardContent,
   CardAction,
   Button,
   Heading,
   CardHeading,
 } from '@digigov/react-core';
-import { FieldSpec } from '@digigov/form';
-import AddObjects from '@digigov/form/MultiplicityField/add-objects';
-import { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';
-import FieldObject from '@digigov/form/FieldObject';
-import FieldContainer from '@digigov/form/Field/FieldBaseContainer';
 
 export interface MultiplicityProps
   extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'error' | 'extra'> {
@@ -78,7 +78,7 @@ export const Multiplicity: React.FC<MultiplicityProps> = ({
     >
       {stashedObjects.length > 0 ? (
         <div>
-          <Heading size="m">{extra?.label.object.title_added}</Heading>
+          <Heading size="md">{extra?.label.object.title_added}</Heading>
           {stashedObjects.map((_Object, index) => {
             return (
               <ListObject
@@ -147,7 +147,7 @@ export const ListObject: React.FC<ListObjectProps> = ({
       <CardHeading>
         {extra?.label.object.title} #{index + 1}
       </CardHeading>
-      <CardText>
+      <CardContent>
         <FieldObject
           name={currentName}
           formState={formState}
@@ -155,7 +155,7 @@ export const ListObject: React.FC<ListObjectProps> = ({
           control={control}
           {...extra?.of}
         />
-      </CardText>
+      </CardContent>
       <CardAction>
         <Button type="button" variant="link" onClick={() => onDelete(index)}>
           {extra?.label.object.delete}

package/src/Questions/Questions.stories.js

@@ -2,6 +2,6 @@ import Questions from '@digigov/form/Questions';
 export default {
   title: 'Digigov Form/Questions',
   component: Questions,
-  displayName: 'Questions'
+  displayName: 'Questions',
 };
 export * from '@digigov/form/Questions/__stories__/Default';

package/src/Questions/Questions.tsx

@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
+import { getNextStep } from '@digigov/form/Questions/getNextStep';
+import { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';
 import { StepInterface } from '@digigov/form/Questions/Step/types';
 import { QuestionsInterface } from '@digigov/form/Questions/types';
-import { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';
-import { getNextStep } from '@digigov/form/Questions/getNextStep';
 
 const isBrowser = typeof window !== 'undefined';
 

package/src/Questions/Step/ReviewStep.tsx

@@ -1,17 +1,17 @@
 import React, { useContext } from 'react';
+import { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';
+import { StepContext } from '@digigov/form/Questions/Step/StepContext';
+import { StepTitleBase } from '@digigov/form/Questions/Step/StepTitle';
 import {
   SummaryList,
   SummaryListItem,
   SummaryListItemKey,
   SummaryListItemValue,
   SummaryListItemAction,
-} from '@digigov/ui/core/SummaryList';
+} from '@digigov/ui/content/SummaryList';
+import { Button } from '@digigov/ui/form/Button';
+import { useTranslation } from '@digigov/ui/i18n';
 import Title from '@digigov/ui/typography/Title';
-import { Button } from '@digigov/ui/core';
-import { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';
-import { StepTitleBase } from '@digigov/form/Questions/Step/StepTitle';
-import { StepContext } from '@digigov/form/Questions/Step/StepContext';
-import { useTranslation } from '@digigov/ui/app/i18n';
 
 export const ReviewStep = (): React.ReactElement => {
   const { t } = useTranslation();

package/src/Questions/Step/Step.tsx

@@ -1,7 +1,7 @@
 import React, { useContext, useState } from 'react';
 import { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';
-import { StepContext } from '@digigov/form/Questions/Step/StepContext';
 import { StepArrayReview } from '@digigov/form/Questions/Step/StepArrayReview';
+import { StepContext } from '@digigov/form/Questions/Step/StepContext';
 import { StepInterface } from '@digigov/form/Questions/Step/types';
 
 /**

package/src/Questions/Step/StepArrayReview.tsx

@@ -1,22 +1,22 @@
 import React, { useContext } from 'react';
-import { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';
-import PageTitle, { PageTitleHeading } from '@digigov/ui/app/PageTitle';
-import Button from '@digigov/ui/core/Button';
-import FormBuilder from '@digigov/form/FormBuilder';
-import { FieldSpec } from '@digigov/form/types';
 import { Field } from '@digigov/form/Field';
 import { Fieldset } from '@digigov/form/Fieldset';
+import FormBuilder from '@digigov/form/FormBuilder';
 import Label from '@digigov/form/inputs/Label';
+import { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';
+import { getAddMoreFields } from '@digigov/form/Questions/Step/getAddMoreFields';
+import { StepArrayReviewInterface } from '@digigov/form/Questions/Step/types';
+import { FieldSpec } from '@digigov/form/types';
+import PageTitleContainer, { PageTitleHeading } from '@digigov/ui/app/PageTitleContainer';
 import {
   SummaryList,
   SummaryListItem,
   SummaryListItemKey,
   SummaryListItemValue,
   SummaryListItemAction,
-} from '@digigov/ui/core/SummaryList';
-import { useTranslation } from '@digigov/ui/app/i18n';
-import { StepArrayReviewInterface } from '@digigov/form/Questions/Step/types';
-import { getAddMoreFields } from '@digigov/form/Questions/Step/getAddMoreFields';
+} from '@digigov/ui/content/SummaryList';
+import Button from '@digigov/ui/form/Button';
+import { useTranslation } from '@digigov/ui/i18n';
 
 export const StepArrayReview: React.FC<StepArrayReviewInterface> = (props) => {
   const { t } = useTranslation();
@@ -28,11 +28,11 @@ export const StepArrayReview: React.FC<StepArrayReviewInterface> = (props) => {
     ) || {};
   return (
     <>
-      <PageTitle>
+      <PageTitleContainer>
         <PageTitleHeading>
           {currentStep.review?.title && t(currentStep.review?.title)}
         </PageTitleHeading>
-      </PageTitle>
+      </PageTitleContainer>
       <SummaryList>
         {props.array.map(
           (item: { [x: string]: React.ReactNode }, idx: number) => (

package/src/Questions/Step/StepDescription.tsx

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { StepContext } from '@digigov/form/Questions/Step/StepContext';
+import { useTranslation } from '@digigov/ui/i18n';
 import Paragraph, { ParagraphProps } from '@digigov/ui/typography/Paragraph';
-import { useTranslation } from '@digigov/ui/app/i18n';
 
 export interface StepDescriptionInterface extends ParagraphProps {
   description?: string;

package/src/Questions/Step/StepForm.tsx

@@ -1,12 +1,12 @@
 import React, { useContext } from 'react';
-import { StepContext } from '@digigov/form/Questions/Step/StepContext';
-import FormBuilder from '@digigov/form/FormBuilder';
-import Fieldset from '@digigov/form/Fieldset';
 import Field from '@digigov/form/Field';
-import { FormBuilderProps } from '@digigov/form/types';
 import { FieldProps } from '@digigov/form/Field/types';
-import Button from '@digigov/ui/core/Button';
-import { useTranslation } from '@digigov/ui/app/i18n';
+import Fieldset from '@digigov/form/Fieldset';
+import FormBuilder from '@digigov/form/FormBuilder';
+import { StepContext } from '@digigov/form/Questions/Step/StepContext';
+import { FormBuilderProps } from '@digigov/form/types';
+import Button from '@digigov/ui/form/Button';
+import { useTranslation } from '@digigov/ui/i18n';
 
 export interface StepFormProps {
   submitButton: boolean;

package/src/Questions/Step/StepTitle.tsx

@@ -1,13 +1,12 @@
 import React, { useContext } from 'react';
 import { StepContext } from '@digigov/form/Questions/Step/StepContext';
-import PageTitle, {
+import PageTitleContainer, {
   PageTitleHeading,
   PageTitleHeadingProps,
-  PageTitleSection,
   PageTitleCaption,
-} from '@digigov/ui/app/PageTitle';
-import BackButton from '@digigov/ui/core/Button/BackButton';
-import { useTranslation } from '@digigov/ui/app/i18n';
+} from '@digigov/ui/app/PageTitleContainer';
+import BackButton from '@digigov/ui/form/Button/BackButton';
+import { useTranslation } from '@digigov/ui/i18n';
 
 export interface StepTitleInterface {
   title?: string;
@@ -30,18 +29,16 @@ export const StepTitleBase: React.FC<StepTitleInterface> = ({
   const { t } = useTranslation();
   return (
     <>
-      <BackButton>{backButton || t('back.button')}</BackButton>
-      <PageTitle>
+      <BackButton>{backButton || t('button.back')}</BackButton>
+      <PageTitleContainer>
         {children || (
           <>
-            <PageTitleSection>
-              <PageTitleCaption>{caption && t(caption)}</PageTitleCaption>
-              {step && <PageTitleCaption>{step}</PageTitleCaption>}
-            </PageTitleSection>
+            <PageTitleCaption>{caption && t(caption)}</PageTitleCaption>
+            {step && <PageTitleCaption>{step}</PageTitleCaption>}
             <StepTitleHeading>{title && t(title)}</StepTitleHeading>
           </>
         )}
-      </PageTitle>
+      </PageTitleContainer>
     </>
   );
 };
@@ -53,7 +50,12 @@ export const StepTitleBase: React.FC<StepTitleInterface> = ({
 export const StepTitle: React.FC<StepTitleInterface> = (props) => {
   const { caption, title, step, backButton } = useContext(StepContext);
   return (
-    <StepTitleBase backButton={backButton} caption={caption} step={step} title={title}>
+    <StepTitleBase
+      backButton={backButton}
+      caption={caption}
+      step={step}
+      title={title}
+    >
       {props.children}
     </StepTitleBase>
   );

package/src/Questions/Step/getAddMoreFields.tsx

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
 import { StepInterface } from '@digigov/form/Questions/Step/types';
+import { FieldSpec } from '@digigov/form/types';
 
 export const getAddMoreFields = (currentStep: StepInterface): FieldSpec[] => {
   return [