@digigov/react-core 1.0.0-6b93ebf2 → 1.0.0-88820b1e

package/HeaderSection/index.js

@@ -29,7 +29,7 @@ var HeaderSection = /*#__PURE__*/_react["default"].forwardRef(function HeaderSec
   return /*#__PURE__*/_react["default"].createElement(_Base["default"], (0, _extends2["default"])({
     as: "div",
     ref: ref,
-    className: (0, _clsx["default"])(className, true && 'govgr-header__container')
+    className: (0, _clsx["default"])(className, true && 'govgr-header__section')
   }, props), children);
 });
 

package/Heading/__snapshots__/index.test.tsx.snap

@@ -15,23 +15,6 @@ exports[`renders the Heading with no props 1`] = `
 </ForwardRef(Heading)>
 `;
 
-exports[`renders the Heading with size=l 1`] = `
-<ForwardRef(Heading)
-  size="lg"
->
-  <ForwardRef(Base)
-    as="h2"
-    className="govgr-heading-lg"
-  >
-    <h2
-      className="govgr-heading-lg"
-    >
-      hello
-    </h2>
-  </ForwardRef(Base)>
-</ForwardRef(Heading)>
-`;
-
 exports[`renders the Heading with size=l and element h2 1`] = `
 <ForwardRef(Heading)
   element="h2"
@@ -86,19 +69,19 @@ exports[`renders the Heading with size=l and element h4 1`] = `
 </ForwardRef(Heading)>
 `;
 
-exports[`renders the Heading with size=m 1`] = `
+exports[`renders the Heading with size=lg 1`] = `
 <ForwardRef(Heading)
-  size="md"
+  size="lg"
 >
   <ForwardRef(Base)
-    as="h3"
-    className="govgr-heading-md"
+    as="h2"
+    className="govgr-heading-lg"
   >
-    <h3
-      className="govgr-heading-md"
+    <h2
+      className="govgr-heading-lg"
     >
       hello
-    </h3>
+    </h2>
   </ForwardRef(Base)>
 </ForwardRef(Heading)>
 `;
@@ -157,19 +140,19 @@ exports[`renders the Heading with size=m and element h4 1`] = `
 </ForwardRef(Heading)>
 `;
 
-exports[`renders the Heading with size=s 1`] = `
+exports[`renders the Heading with size=md 1`] = `
 <ForwardRef(Heading)
-  size="sm"
+  size="md"
 >
   <ForwardRef(Base)
-    as="h4"
-    className="govgr-heading-sm"
+    as="h3"
+    className="govgr-heading-md"
   >
-    <h4
-      className="govgr-heading-sm"
+    <h3
+      className="govgr-heading-md"
     >
       hello
-    </h4>
+    </h3>
   </ForwardRef(Base)>
 </ForwardRef(Heading)>
 `;
@@ -228,6 +211,23 @@ exports[`renders the Heading with size=s and element h4 1`] = `
 </ForwardRef(Heading)>
 `;
 
+exports[`renders the Heading with size=sm 1`] = `
+<ForwardRef(Heading)
+  size="sm"
+>
+  <ForwardRef(Base)
+    as="h4"
+    className="govgr-heading-sm"
+  >
+    <h4
+      className="govgr-heading-sm"
+    >
+      hello
+    </h4>
+  </ForwardRef(Base)>
+</ForwardRef(Heading)>
+`;
+
 exports[`renders the Heading with size=xl 1`] = `
 <ForwardRef(Heading)
   size="xl"
@@ -298,3 +298,38 @@ exports[`renders the Heading with size=xl and element h4 1`] = `
   </ForwardRef(Base)>
 </ForwardRef(Heading)>
 `;
+
+exports[`renders the Heading with size=xs 1`] = `
+<ForwardRef(Heading)
+  size="xs"
+>
+  <ForwardRef(Base)
+    as="h5"
+    className="govgr-heading-xs"
+  >
+    <h5
+      className="govgr-heading-xs"
+    >
+      hello
+    </h5>
+  </ForwardRef(Base)>
+</ForwardRef(Heading)>
+`;
+
+exports[`renders the Heading with size=xs and element h4 1`] = `
+<ForwardRef(Heading)
+  element="h4"
+  size="xs"
+>
+  <ForwardRef(Base)
+    as="h4"
+    className="govgr-heading-xs"
+  >
+    <h4
+      className="govgr-heading-xs"
+    >
+      hello
+    </h4>
+  </ForwardRef(Base)>
+</ForwardRef(Heading)>
+`;

package/Heading/index.d.ts

@@ -1,16 +1,16 @@
 import React from 'react';
-import { BaseProps } from '@digigov/react-core/Base';
-export interface HeadingProps extends BaseProps<'h1'> {
+import { TypographyProps } from '@digigov/react-core/Typography';
+export interface HeadingProps extends TypographyProps {
     /**
-    * size is optional. 'xl' is the default value.
-    * Use 'xl' when this heading is the main page title.
-    * @value 'xl'
-    * @value 'lg'
-    * @value 'md'
-    * @value 'sm'
-    * @default 'xl'
-    */
-    size?: 'xl' | 'lg' | 'md' | 'sm';
+     * size is optional. 'xl' is the default value.
+     * Use 'xl' when this heading is the main page title.
+     * @value 'xl'
+     * @value 'lg'
+     * @value 'md'
+     * @value 'sm'
+     * @default 'xl'
+     */
+    size?: 'xl' | 'lg' | 'md' | 'sm' | 'xs';
     /**
     * element is optional. 'h1' is the default value.
     * Use 'h1' when this heading is the main page title.
@@ -18,10 +18,10 @@ export interface HeadingProps extends BaseProps<'h1'> {
     */
     element?: HeadingHTMLElements;
 }
-export declare type HeadingHTMLElements = 'h1' | 'h2' | 'h3' | 'h4';
+export declare type HeadingHTMLElements = 'h1' | 'h2' | 'h3' | 'h4' | 'h5';
 /**
  * Heading component is used to place a title in a the page.
- * Heading component must be wraped inside Main component.
+ * Heading component must be wrapped inside Main component.
  */
-export declare const Heading: React.ForwardRefExoticComponent<Pick<HeadingProps, "slot" | "style" | "title" | "as" | "className" | "color" | "id" | "lang" | "role" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "size" | "margin" | "marginTop" | "marginBottom" | "marginLeft" | "marginRight" | "padding" | "paddingTop" | "paddingBottom" | "paddingLeft" | "paddingRight" | "printHidden" | "printVisible" | "xsUpHidden" | "smUpHidden" | "mdUpHidden" | "lgUpHidden" | "xlUpHidden" | "xsHidden" | "smHidden" | "mdHidden" | "lgHidden" | "xlHidden" | "element"> & React.RefAttributes<HTMLHeadingElement>>;
+export declare const Heading: React.ForwardRefExoticComponent<Pick<HeadingProps, "slot" | "style" | "title" | "as" | "className" | "color" | "id" | "lang" | "role" | "tabIndex" | "fontSize" | "fontWeight" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "size" | "margin" | "marginTop" | "marginBottom" | "marginLeft" | "marginRight" | "padding" | "paddingTop" | "paddingBottom" | "paddingLeft" | "paddingRight" | "printHidden" | "printVisible" | "xsUpHidden" | "smUpHidden" | "mdUpHidden" | "lgUpHidden" | "xlUpHidden" | "xsHidden" | "smHidden" | "mdHidden" | "lgHidden" | "xlHidden" | "element"> & React.RefAttributes<HTMLHeadingElement>>;
 export default Heading;

package/Heading/index.js

@@ -15,7 +15,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _clsx = _interopRequireDefault(require("clsx"));
 
-var _Base = _interopRequireDefault(require("@digigov/react-core/Base"));
+var _Typography = _interopRequireDefault(require("@digigov/react-core/Typography"));
 
 var _excluded = ["size", "element", "className", "children"];
 
@@ -33,13 +33,16 @@ var getComponentBySize = function getComponentBySize(size) {
     case 'sm':
       return 'h4';
 
+    case 'xs':
+      return 'h5';
+
     default:
       return 'h1';
   }
 };
 /**
  * Heading component is used to place a title in a the page.
- * Heading component must be wraped inside Main component.
+ * Heading component must be wrapped inside Main component.
  */
 
 
@@ -51,10 +54,10 @@ var Heading = /*#__PURE__*/_react["default"].forwardRef(function Heading(_ref, r
       children = _ref.children,
       props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   var Component = element ? element : getComponentBySize(size);
-  return /*#__PURE__*/_react["default"].createElement(_Base["default"], (0, _extends2["default"])({
+  return /*#__PURE__*/_react["default"].createElement(_Typography["default"], (0, _extends2["default"])({
     as: Component,
     ref: ref,
-    className: (0, _clsx["default"])(className, size === 'xl' && 'govgr-heading-xl', size === 'lg' && 'govgr-heading-lg', size === 'md' && 'govgr-heading-md', size === 'sm' && 'govgr-heading-sm')
+    className: (0, _clsx["default"])(className, size !== undefined && "govgr-heading-".concat(size))
   }, props), children);
 });
 

package/Heading/index.test.js

@@ -26,7 +26,7 @@ var _ref3 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'lg'
 }, "hello");
 
-it('renders the Heading with size=l', function () {
+it('renders the Heading with size=lg', function () {
   expect((0, _enzyme.mount)(_ref3)).toMatchSnapshot();
 });
 
@@ -34,7 +34,7 @@ var _ref4 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'md'
 }, "hello");
 
-it('renders the Heading with size=m', function () {
+it('renders the Heading with size=md', function () {
   expect((0, _enzyme.mount)(_ref4)).toMatchSnapshot();
 });
 
@@ -42,114 +42,131 @@ var _ref5 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'sm'
 }, "hello");
 
-it('renders the Heading with size=s', function () {
+it('renders the Heading with size=sm', function () {
   expect((0, _enzyme.mount)(_ref5)).toMatchSnapshot();
 });
 
 var _ref6 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+  size: 'xs'
+}, "hello");
+
+it('renders the Heading with size=xs', function () {
+  expect((0, _enzyme.mount)(_ref6)).toMatchSnapshot();
+});
+
+var _ref7 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'sm',
   element: "h2"
 }, "hello");
 
 it('renders the Heading with size=s and element h2', function () {
-  expect((0, _enzyme.mount)(_ref6)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref7)).toMatchSnapshot();
 });
 
-var _ref7 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref8 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'sm',
   element: "h3"
 }, "hello");
 
 it('renders the Heading with size=s and element h3', function () {
-  expect((0, _enzyme.mount)(_ref7)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref8)).toMatchSnapshot();
 });
 
-var _ref8 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref9 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'sm',
   element: "h4"
 }, "hello");
 
 it('renders the Heading with size=s and element h4', function () {
-  expect((0, _enzyme.mount)(_ref8)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref9)).toMatchSnapshot();
 });
 
-var _ref9 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref10 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'md',
   element: "h2"
 }, "hello");
 
 it('renders the Heading with size=m and element h2', function () {
-  expect((0, _enzyme.mount)(_ref9)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref10)).toMatchSnapshot();
 });
 
-var _ref10 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref11 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'md',
   element: "h3"
 }, "hello");
 
 it('renders the Heading with size=m and element h3', function () {
-  expect((0, _enzyme.mount)(_ref10)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref11)).toMatchSnapshot();
 });
 
-var _ref11 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref12 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'md',
   element: "h4"
 }, "hello");
 
 it('renders the Heading with size=m and element h4', function () {
-  expect((0, _enzyme.mount)(_ref11)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref12)).toMatchSnapshot();
 });
 
-var _ref12 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref13 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'lg',
   element: "h2"
 }, "hello");
 
 it('renders the Heading with size=l and element h2', function () {
-  expect((0, _enzyme.mount)(_ref12)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref13)).toMatchSnapshot();
 });
 
-var _ref13 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref14 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'lg',
   element: "h3"
 }, "hello");
 
 it('renders the Heading with size=l and element h3', function () {
-  expect((0, _enzyme.mount)(_ref13)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref14)).toMatchSnapshot();
 });
 
-var _ref14 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref15 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'lg',
   element: "h4"
 }, "hello");
 
 it('renders the Heading with size=l and element h4', function () {
-  expect((0, _enzyme.mount)(_ref14)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref15)).toMatchSnapshot();
 });
 
-var _ref15 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref16 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'xl',
   element: "h2"
 }, "hello");
 
 it('renders the Heading with size=xl and element h2', function () {
-  expect((0, _enzyme.mount)(_ref15)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref16)).toMatchSnapshot();
 });
 
-var _ref16 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref17 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'xl',
   element: "h3"
 }, "hello");
 
 it('renders the Heading with size=xl and element h3', function () {
-  expect((0, _enzyme.mount)(_ref16)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref17)).toMatchSnapshot();
 });
 
-var _ref17 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+var _ref18 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
   size: 'xl',
   element: "h4"
 }, "hello");
 
 it('renders the Heading with size=xl and element h4', function () {
-  expect((0, _enzyme.mount)(_ref17)).toMatchSnapshot();
+  expect((0, _enzyme.mount)(_ref18)).toMatchSnapshot();
+});
+
+var _ref19 = /*#__PURE__*/_react["default"].createElement(_Heading["default"], {
+  size: 'xs',
+  element: "h4"
+}, "hello");
+
+it('renders the Heading with size=xs and element h4', function () {
+  expect((0, _enzyme.mount)(_ref19)).toMatchSnapshot();
 });

package/HeadingCaption/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { BaseProps } from '@digigov/react-core/Base';
-export interface HeadingCaptionProps extends BaseProps<'span'> {
+import { TypographyProps } from '@digigov/react-core/Typography';
+export interface HeadingCaptionProps extends TypographyProps {
     /**
     * size is optional. The default value is 'lg'.
     * This size should be the same as the matching Heading.
@@ -15,5 +15,5 @@ export interface HeadingCaptionProps extends BaseProps<'span'> {
  * Sometimes you may need to make it clear that a page is part of a larger section or group.
  * To do this, you can use a Heading with a HeadingCaption above it.
  */
-export declare const HeadingCaption: React.ForwardRefExoticComponent<Pick<HeadingCaptionProps, "slot" | "style" | "title" | "as" | "className" | "color" | "id" | "lang" | "role" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "size" | "margin" | "marginTop" | "marginBottom" | "marginLeft" | "marginRight" | "padding" | "paddingTop" | "paddingBottom" | "paddingLeft" | "paddingRight" | "printHidden" | "printVisible" | "xsUpHidden" | "smUpHidden" | "mdUpHidden" | "lgUpHidden" | "xlUpHidden" | "xsHidden" | "smHidden" | "mdHidden" | "lgHidden" | "xlHidden"> & React.RefAttributes<HTMLSpanElement>>;
+export declare const HeadingCaption: React.ForwardRefExoticComponent<Pick<HeadingCaptionProps, "slot" | "style" | "title" | "as" | "className" | "color" | "id" | "lang" | "role" | "tabIndex" | "fontSize" | "fontWeight" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "size" | "margin" | "marginTop" | "marginBottom" | "marginLeft" | "marginRight" | "padding" | "paddingTop" | "paddingBottom" | "paddingLeft" | "paddingRight" | "printHidden" | "printVisible" | "xsUpHidden" | "smUpHidden" | "mdUpHidden" | "lgUpHidden" | "xlUpHidden" | "xsHidden" | "smHidden" | "mdHidden" | "lgHidden" | "xlHidden"> & React.RefAttributes<HTMLSpanElement>>;
 export default HeadingCaption;

package/HeadingCaption/index.js

@@ -15,7 +15,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _clsx = _interopRequireDefault(require("clsx"));
 
-var _Base = _interopRequireDefault(require("@digigov/react-core/Base"));
+var _Typography = _interopRequireDefault(require("@digigov/react-core/Typography"));
 
 var _excluded = ["size", "className", "children"];
 
@@ -29,10 +29,10 @@ var HeadingCaption = /*#__PURE__*/_react["default"].forwardRef(function HeadingC
       className = _ref.className,
       children = _ref.children,
       props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  return /*#__PURE__*/_react["default"].createElement(_Base["default"], (0, _extends2["default"])({
+  return /*#__PURE__*/_react["default"].createElement(_Typography["default"], (0, _extends2["default"])({
     as: "span",
     ref: ref,
-    className: (0, _clsx["default"])(className, size === 'xl' && 'govgr-caption-xl', size === 'lg' && 'govgr-caption-lg', size === 'md' && 'govgr-caption-md')
+    className: (0, _clsx["default"])(className, size !== undefined && "govgr-caption-".concat(size))
   }, props), children);
 });
 

package/Hint/__snapshots__/index.test.tsx.snap

@@ -2,66 +2,89 @@
 
 exports[`renders the Hint with fontSize=14 1`] = `
 <ForwardRef(Hint)
-  fontSize="14"
+  fontSize={14}
 >
-  <ForwardRef(Base)
+  <ForwardRef(Typography)
     as="p"
-    className="govgr-!-font-size-14 govgr-hint"
+    className="govgr-hint"
+    fontSize={14}
   >
-    <p
-      className="govgr-!-font-size-14 govgr-hint"
+    <ForwardRef(Base)
+      as="p"
+      className="govgr-hint govgr-!-font-size-14"
     >
-      hello
-    </p>
-  </ForwardRef(Base)>
+      <p
+        className="govgr-hint govgr-!-font-size-14"
+      >
+        hello
+      </p>
+    </ForwardRef(Base)>
+  </ForwardRef(Typography)>
 </ForwardRef(Hint)>
 `;
 
 exports[`renders the Hint with fontSize=16 1`] = `
 <ForwardRef(Hint)
-  fontSize="16"
+  fontSize={16}
 >
-  <ForwardRef(Base)
+  <ForwardRef(Typography)
     as="p"
-    className="govgr-!-font-size-16 govgr-hint"
+    className="govgr-hint"
+    fontSize={16}
   >
-    <p
-      className="govgr-!-font-size-16 govgr-hint"
+    <ForwardRef(Base)
+      as="p"
+      className="govgr-hint govgr-!-font-size-16"
     >
-      hello
-    </p>
-  </ForwardRef(Base)>
+      <p
+        className="govgr-hint govgr-!-font-size-16"
+      >
+        hello
+      </p>
+    </ForwardRef(Base)>
+  </ForwardRef(Typography)>
 </ForwardRef(Hint)>
 `;
 
 exports[`renders the Hint with fontSize=24 1`] = `
 <ForwardRef(Hint)
-  fontSize="24"
+  fontSize={24}
 >
-  <ForwardRef(Base)
+  <ForwardRef(Typography)
     as="p"
-    className="govgr-!-font-size-24 govgr-hint"
+    className="govgr-hint"
+    fontSize={24}
   >
-    <p
-      className="govgr-!-font-size-24 govgr-hint"
+    <ForwardRef(Base)
+      as="p"
+      className="govgr-hint govgr-!-font-size-24"
     >
-      hello
-    </p>
-  </ForwardRef(Base)>
+      <p
+        className="govgr-hint govgr-!-font-size-24"
+      >
+        hello
+      </p>
+    </ForwardRef(Base)>
+  </ForwardRef(Typography)>
 </ForwardRef(Hint)>
 `;
 
 exports[`renders the Hint with no props 1`] = `
 <ForwardRef(Hint)>
-  <ForwardRef(Base)
+  <ForwardRef(Typography)
     as="p"
     className="govgr-hint"
   >
-    <p
+    <ForwardRef(Base)
+      as="p"
       className="govgr-hint"
     >
-      hello
-    </p>
-  </ForwardRef(Base)>
+      <p
+        className="govgr-hint"
+      >
+        hello
+      </p>
+    </ForwardRef(Base)>
+  </ForwardRef(Typography)>
 </ForwardRef(Hint)>
 `;