Skip to content

Commit 5fd6ba2

Browse files
author
Phil Hess
committed
Update button, paragraph, and inputformfield components
1 parent 9bb6be4 commit 5fd6ba2

3 files changed

Lines changed: 9 additions & 16 deletions

File tree

src/atoms/buttons/button.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ButtonSizes } from "../constants/button-sizes";
22
import { ButtonStyles } from "../constants/button-styles";
33
import { ButtonTypes } from "../constants/button-types";
44
import { AccessibilityLabels } from "../../enums/accessibility-labels";
5-
import React, { forwardRef } from "react";
5+
import React, { forwardRef, PropsWithChildren, Ref } from "react";
66
import { StringUtils } from "andculturecode-javascript-core";
77
import "./button.scss";
88

@@ -38,10 +38,8 @@ export interface ButtonProps {
3838
// #region Component
3939
// -----------------------------------------------------------------------------------------
4040

41-
const Button: React.RefForwardingComponent<
42-
HTMLButtonElement,
43-
ButtonProps
44-
> = forwardRef((props: ButtonProps, ref: React.Ref<HTMLButtonElement>) => {
41+
const Button = forwardRef<HTMLButtonElement, ButtonProps>(
42+
(props: PropsWithChildren<ButtonProps>, ref: Ref<HTMLButtonElement>) => {
4543
const {
4644
accessibleText,
4745
ariaControls,

src/atoms/typography/paragraph.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { forwardRef } from "react";
1+
import React, { forwardRef, PropsWithChildren, Ref } from "react";
22
import { ParagraphSizes } from "../constants/paragraph-sizes";
33
import { StringUtils } from "andculturecode-javascript-core";
44

@@ -21,11 +21,8 @@ export interface ParagraphProps {
2121
// #region Component
2222
// -------------------------------------------------------------------------------------------------
2323

24-
const Paragraph: React.RefForwardingComponent<
25-
HTMLParagraphElement,
26-
ParagraphProps
27-
> = forwardRef(
28-
(props: ParagraphProps, ref: React.Ref<HTMLParagraphElement>) => {
24+
const Paragraph = forwardRef<HTMLParagraphElement, ParagraphProps>(
25+
(props: PropsWithChildren<ParagraphProps>, ref: Ref<HTMLParagraphElement>) => {
2926
let cssClassNames: Array<any> = [];
3027

3128
if (StringUtils.hasValue(props.cssClassName)) {

src/molecules/form-fields/input-form-field.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { forwardRef, Ref, RefObject } from "react";
1+
import React, { forwardRef, PropsWithChildren, Ref, RefObject } from "react";
22
import uuid from "uuid";
33
import { AccessibilityLabels } from "../../enums/accessibility-labels";
44
import { CollectionUtils, StringUtils } from "andculturecode-javascript-core";
@@ -45,10 +45,8 @@ export interface InputFormFieldProps extends InputProperties {
4545
// #region Component
4646
// -----------------------------------------------------------------------------------------
4747

48-
const InputFormField: React.RefForwardingComponent<
49-
HTMLInputElement,
50-
InputFormFieldProps
51-
> = forwardRef((props: InputFormFieldProps, ref: Ref<HTMLInputElement>) => {
48+
const InputFormField = forwardRef<HTMLInputElement, InputFormFieldProps>(
49+
(props: PropsWithChildren<InputFormFieldProps>, ref: Ref<HTMLInputElement>) => {
5250
const {
5351
disabled,
5452
errorMessage,

0 commit comments

Comments
 (0)