@transferwise/components 0.0.0-experimental-5e97fd1 → 0.0.0-experimental-3d0a13d

package/src/withDisplayFormat/{WithDisplayFormat.tsx → WithDisplayFormat.js}

@@ -1,4 +1,5 @@
-import { Component, KeyboardEvent, ClipboardEvent, ChangeEvent, FocusEvent } from 'react';
+import PropTypes from 'prop-types';
+import { Component } from 'react';
 
 import { HistoryNavigator } from '../common';
 import {
@@ -9,61 +10,14 @@ import {
   getDistanceToPreviousSymbol,
   getDistanceToNextSymbol,
 } from '../common/textFormat';
-import { InputProps } from '../inputs/Input';
-import { TextAreaProps } from '../inputs/TextArea';
 
-export type TextInputProps = {
-  value?: string;
-  displayPattern: string;
-  /**
-   * autocomplete hides our form help so we need to disable it when help text
-   * is present. Chrome ignores autocomplete=off, the only way to disable it is
-   * to provide an 'invalid' value, for which 'disabled' serves.
-   */
-  autoComplete?: InputProps['autoComplete'] | 'disabled';
-  onChange?: (value: string | null) => void;
-  onBlur?: (value: string | null) => void;
-  onFocus?: (value: string | null) => void;
-} & InputProps;
-
-export type Props = typeof WithDisplayFormat.defaultProps & {
-  render: (renderProps: InputProps | TextAreaProps) => JSX.Element;
-} & TextInputProps;
-
-export type EventType =
-  | 'KeyDown'
-  | 'Paste'
-  | 'Cut'
-  | 'Undo'
-  | 'Redo'
-  | 'Backspace'
-  | 'Delete'
-  | null;
-
-type State = {
-  value: string;
-  historyNavigator: HistoryNavigator;
-  prevDisplayPattern?: string;
-  triggerType?: EventType;
-  triggerEvent?: KeyboardEvent<HTMLInputElement> | null;
-  pastedLength?: number;
-  selectionStart?: HTMLInputElement['selectionStart'];
-  selectionEnd?: HTMLInputElement['selectionEnd'];
-};
-
-class WithDisplayFormat extends Component<Props, State> {
-  static defaultProps = {
-    autoComplete: 'off',
-    displayPattern: '',
-    type: 'text',
-    value: '',
-  };
-
-  constructor(props: Props) {
+class WithDisplayFormat extends Component {
+  constructor(props) {
     super(props);
-    const unformattedValue = unformatWithPattern(props.value, props.displayPattern);
+    const { value, displayPattern } = props;
+    const unformattedValue = unformatWithPattern(value, displayPattern);
     this.state = {
-      value: formatWithPattern(unformattedValue, props.displayPattern),
+      value: formatWithPattern(unformattedValue, displayPattern),
       historyNavigator: new HistoryNavigator(),
       prevDisplayPattern: props.displayPattern,
       triggerType: null,
@@ -71,11 +25,12 @@ class WithDisplayFormat extends Component<Props, State> {
     };
   }
 
-  static getDerivedStateFromProps(
-    { displayPattern }: Props,
-    { prevDisplayPattern = displayPattern, value, historyNavigator }: State,
-  ) {
-    if (prevDisplayPattern !== displayPattern) {
+  static getDerivedStateFromProps(nextProps, previousState) {
+    const { displayPattern } = nextProps;
+    const { prevDisplayPattern } = previousState;
+    if (previousState.prevDisplayPattern !== displayPattern) {
+      const { value, historyNavigator } = previousState;
+
       const unFormattedValue = unformatWithPattern(value, prevDisplayPattern);
       historyNavigator.reset();
 
@@ -90,37 +45,32 @@ class WithDisplayFormat extends Component<Props, State> {
     return null;
   }
 
-  getUserAction = (unformattedValue: string): EventType => {
+  getUserAction = (unformattedValue) => {
     const { triggerEvent, triggerType, value } = this.state;
     const { displayPattern } = this.props;
 
-    if (triggerEvent) {
-      const charCode = String.fromCharCode(triggerEvent.which).toLowerCase();
+    const charCode = String.fromCharCode(triggerEvent.which).toLowerCase();
 
-      if (triggerType === 'Paste' || triggerType === 'Cut') {
-        return triggerType;
-      }
+    if (triggerType === 'Paste' || triggerType === 'Cut') {
+      return triggerType;
+    }
 
-      if ((triggerEvent.ctrlKey || triggerEvent.metaKey) && charCode === 'z') {
-        return triggerEvent.shiftKey ? 'Redo' : 'Undo';
-      }
-      // Detect mouse event redo
-      if (triggerEvent.ctrlKey && charCode === 'd') {
-        return 'Delete';
-      }
+    if ((triggerEvent.ctrlKey || triggerEvent.metaKey) && charCode === 'z') {
+      return triggerEvent.shiftKey ? 'Redo' : 'Undo';
+    }
+    // Detect mouse event redo
+    if (triggerEvent.ctrlKey && charCode === 'd') {
+      return 'Delete';
+    }
 
-      // Android Fix.
-      if (
-        typeof triggerEvent.key === 'undefined' &&
-        unformattedValue.length <= unformatWithPattern(value, displayPattern).length
-      ) {
+    // Android Fix.
+    if (typeof triggerEvent.key === 'undefined') {
+      if (unformattedValue.length <= unformatWithPattern(value, displayPattern).length) {
         return 'Backspace';
       }
-      return triggerEvent.key as EventType;
-    } else {
-      // triggerEvent can be null only in case of "autofilling" (via password manager extension or browser build-in one) events
-      return 'Paste';
     }
+
+    return triggerEvent.key;
   };
 
   resetEvent = () => {
@@ -131,7 +81,7 @@ class WithDisplayFormat extends Component<Props, State> {
     });
   };
 
-  detectUndoRedo = (event: KeyboardEvent<HTMLInputElement>) => {
+  detectUndoRedo = (event) => {
     const charCode = String.fromCharCode(event.which).toLowerCase();
     if ((event.ctrlKey || event.metaKey) && charCode === 'z') {
       return event.shiftKey ? 'Redo' : 'Undo';
@@ -139,9 +89,9 @@ class WithDisplayFormat extends Component<Props, State> {
     return null;
   };
 
-  handleOnKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+  handleOnKeyDown = (event) => {
     event.persist();
-    const { selectionStart, selectionEnd } = event.target as HTMLInputElement;
+    const { selectionStart, selectionEnd } = event.target;
     const { historyNavigator } = this.state;
     const { displayPattern } = this.props;
 
@@ -164,7 +114,7 @@ class WithDisplayFormat extends Component<Props, State> {
     }
   };
 
-  handleOnPaste = (event: ClipboardEvent<HTMLInputElement>) => {
+  handleOnPaste = (event) => {
     const { displayPattern } = this.props;
     const pastedLength = unformatWithPattern(
       event.clipboardData.getData('Text'),
@@ -178,19 +128,23 @@ class WithDisplayFormat extends Component<Props, State> {
     this.setState({ triggerType: 'Cut' });
   };
 
-  isKeyAllowed = (action: EventType) => {
+  isKeyAllowed = (action) => {
     const { displayPattern } = this.props;
     const symbolsInPattern = displayPattern.split('').filter((character) => character !== '*');
 
-    return !symbolsInPattern.includes(action as string);
+    return !symbolsInPattern.includes(action);
   };
 
-  handleOnChange = (event: ChangeEvent<HTMLInputElement>) => {
-    const { historyNavigator, triggerType } = this.state;
+  handleOnChange = (event) => {
+    const { historyNavigator, triggerEvent, triggerType } = this.state;
     const { displayPattern, onChange } = this.props;
     const { value } = event.target;
     let unformattedValue = unformatWithPattern(value, displayPattern);
-    const action = this.getUserAction(unformattedValue);
+    const action =
+      triggerEvent === null
+        ? // triggerEvent can be null only in case of "autofilling" (via password manager extension or browser build-in one) events
+          'Paste'
+        : this.getUserAction(unformattedValue);
     if (!this.isKeyAllowed(action) || triggerType === 'Undo' || triggerType === 'Redo') {
       return;
     }
@@ -204,20 +158,19 @@ class WithDisplayFormat extends Component<Props, State> {
 
     this.handleCursorPositioning(action);
 
-    this.setState({ value: newFormattedValue }, () => {
-      this.resetEvent();
-      if (onChange) {
-        const broadcastValue = unformatWithPattern(newFormattedValue, displayPattern);
-        onChange(broadcastValue);
-      }
-    });
+    const broadcastValue = unformatWithPattern(newFormattedValue, displayPattern);
+
+    this.setState({ value: newFormattedValue }, this.resetEvent(), onChange(broadcastValue));
   };
 
-  handleOnBlur = (event: FocusEvent<HTMLInputElement>) => {
-    this.props.onBlur?.(unformatWithPattern(event.target.value, this.props.displayPattern));
+  handleOnBlur = (event) => {
+    const { displayPattern, onBlur } = this.props;
+    if (onBlur) {
+      onBlur(unformatWithPattern(event.target.value, displayPattern));
+    }
   };
 
-  handleOnFocus = (event: FocusEvent<HTMLInputElement>) => {
+  handleOnFocus = (event) => {
     const { displayPattern, onFocus } = this.props;
     if (onFocus) {
       this.handleOnChange(event);
@@ -225,14 +178,13 @@ class WithDisplayFormat extends Component<Props, State> {
     }
   };
 
-  handleDelete = (unformattedValue: string, action: EventType) => {
+  handleDelete = (unformattedValue, action) => {
     const { displayPattern } = this.props;
     const { selectionStart, selectionEnd } = this.state;
     const newStack = [...unformattedValue];
     if (selectionStart === selectionEnd) {
       let startPosition =
-        (selectionStart as number) -
-        getCountOfSymbolsInSelection(0, selectionStart, displayPattern);
+        selectionStart - getCountOfSymbolsInSelection(0, selectionStart, displayPattern);
       let toDelete = 0;
 
       let count = getDistanceToNextSymbol(selectionStart, displayPattern);
@@ -251,49 +203,110 @@ class WithDisplayFormat extends Component<Props, State> {
     return newStack.join('');
   };
 
-  handleCursorPositioning = (action: EventType) => {
+  handleCursorPositioning = (action) => {
     const { displayPattern } = this.props;
     const { triggerEvent, selectionStart, selectionEnd, pastedLength } = this.state;
 
     const cursorPosition = getCursorPositionAfterKeystroke(
       action,
-      selectionStart as number,
-      selectionEnd as number,
+      selectionStart,
+      selectionEnd,
       displayPattern,
-      pastedLength as number,
+      pastedLength,
     );
 
     setTimeout(() => {
       if (triggerEvent) {
-        (triggerEvent.target as HTMLInputElement).setSelectionRange(cursorPosition, cursorPosition);
+        triggerEvent.target.setSelectionRange(cursorPosition, cursorPosition);
       }
       this.setState({ selectionStart: cursorPosition, selectionEnd: cursorPosition });
     }, 0);
   };
 
   render() {
-    return this.props.render({
-      value: this.state.value,
-      type: this.props.type,
-      inputMode: this.props.inputMode,
-      className: this.props.className,
-      id: this.props.id,
-      name: this.props.name,
-      placeholder: this.props.placeholder,
-      readOnly: this.props.readOnly,
-      required: this.props.required,
-      minLength: this.props.minLength,
-      maxLength: this.props.maxLength,
-      disabled: this.props.disabled,
-      autoComplete: this.props.autoComplete,
+    const {
+      type,
+      inputMode,
+      className,
+      id,
+      name,
+      placeholder,
+      readOnly,
+      required,
+      minLength,
+      maxLength,
+      disabled,
+      autoComplete,
+    } = this.props;
+    const { value } = this.state;
+    const renderProps = {
+      type,
+      inputMode,
+      className,
+      id,
+      name,
+      placeholder,
+      readOnly,
+      required,
+      minLength,
+      maxLength,
+      disabled,
+      autoComplete,
+      value,
       onFocus: this.handleOnFocus,
       onBlur: this.handleOnBlur,
       onPaste: this.handleOnPaste,
       onKeyDown: this.handleOnKeyDown,
       onChange: this.handleOnChange,
       onCut: this.handleOnCut,
-    });
+    };
+    return this.props.render(renderProps);
   }
 }
 
+WithDisplayFormat.propTypes = {
+  /**
+   * autocomplete hides our form help so we need to disable it when help text
+   * is present. Chrome ignores autocomplete=off, the only way to disable it is
+   * to provide an 'invalid' value, for which 'disabled' serves.
+   */
+  autoComplete: PropTypes.oneOf(['on', 'off', 'disabled']),
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  id: PropTypes.string,
+  maxLength: PropTypes.number,
+  minLength: PropTypes.number,
+  name: PropTypes.string,
+  onFocus: PropTypes.func,
+  onBlur: PropTypes.func,
+  onChange: PropTypes.func.isRequired,
+  placeholder: PropTypes.string,
+  readOnly: PropTypes.bool,
+  render: PropTypes.func.isRequired,
+  required: PropTypes.bool,
+  displayPattern: PropTypes.string,
+  type: PropTypes.string,
+  inputMode: PropTypes.string,
+  value: PropTypes.string,
+};
+
+WithDisplayFormat.defaultProps = {
+  autoComplete: 'off',
+  className: null,
+  disabled: false,
+  id: null,
+  maxLength: null,
+  minLength: null,
+  name: null,
+  placeholder: null,
+  readOnly: false,
+  required: false,
+  displayPattern: '',
+  type: 'text',
+  inputMode: null,
+  value: '',
+  onFocus: null,
+  onBlur: null,
+};
+
 export default WithDisplayFormat;

package/src/withDisplayFormat/index.js

@@ -0,0 +1 @@
+export { default } from './WithDisplayFormat';

package/src/inputWithDisplayFormat/InputWithDisplayFormat.tsx

@@ -1,11 +0,0 @@
-import { Input, type InputProps } from '../inputs/Input';
-import WithDisplayFormat, { type TextInputProps } from '../withDisplayFormat';
-
-const InputWithDisplayFormat = (props: TextInputProps) => (
-  <WithDisplayFormat
-    {...props}
-    render={(renderProps) => <Input {...(renderProps as InputProps)} />}
-  />
-);
-
-export default InputWithDisplayFormat;

package/src/moneyInput/index.js

@@ -1 +0,0 @@
-export { default } from './MoneyInput';

package/src/textareaWithDisplayFormat/TextareaWithDisplayFormat.story.tsx

@@ -1,30 +0,0 @@
-import { StoryObj } from '@storybook/react';
-
-import { userEvent, within } from '../test-utils';
-
-import TextareaWithDisplayFormat from './TextareaWithDisplayFormat';
-
-export default {
-  component: TextareaWithDisplayFormat,
-  title: 'Forms/TextareaWithDisplayFormat',
-};
-
-type Story = StoryObj<typeof TextareaWithDisplayFormat>;
-
-export const Basic: Story = {
-  render: (args) => {
-    return (
-      <>
-        <TextareaWithDisplayFormat
-          value="0000"
-          displayPattern="**** - **** - ****"
-          onChange={console.log}
-        />
-      </>
-    );
-  },
-  play: ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    userEvent.type(canvas.getByRole('textbox'), '111122223333');
-  },
-};

package/src/textareaWithDisplayFormat/TextareaWithDisplayFormat.tsx

@@ -1,11 +0,0 @@
-import { TextArea, type TextAreaProps } from '../inputs/TextArea';
-import WithDisplayFormat, { type TextInputProps } from '../withDisplayFormat';
-
-const TextareaWithDisplayFormat = (props: TextInputProps) => (
-  <WithDisplayFormat
-    {...props}
-    render={(renderProps) => <TextArea {...(renderProps as TextAreaProps)} />}
-  />
-);
-
-export default TextareaWithDisplayFormat;

package/src/withDisplayFormat/index.ts

@@ -1,2 +0,0 @@
-export { default } from './WithDisplayFormat';
-export type { Props as WithDisplayFormatProps, TextInputProps } from './WithDisplayFormat';