rsuite 4.10.2 → 4.10.6

package/src/Timeline/TimelineItem.tsx

@@ -1,9 +1,8 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { compose } from 'recompose';
 
-import { prefix, defaultProps, withStyleProps } from '../utils';
+import { compose, prefix, defaultProps, withStyleProps } from '../utils';
 import { TimelineItemProps } from './TimelineItem.d';
 
 class TimelineItem extends React.Component<TimelineItemProps> {

package/src/Toggle/Toggle.tsx

@@ -1,9 +1,8 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { compose } from 'recompose';
 
-import { prefix, withStyleProps, defaultProps, getUnhandledProps } from '../utils';
+import { compose, prefix, withStyleProps, defaultProps, getUnhandledProps } from '../utils';
 import { ToggleProps } from './Toggle.d';
 
 interface ToggleState {

package/src/Uploader/Uploader.tsx

@@ -2,13 +2,12 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import _ from 'lodash';
-import { compose } from 'recompose';
 
 import IntlContext from '../IntlProvider/IntlContext';
 import withLocale from '../IntlProvider/withLocale';
 import FileItem from './UploadFileItem';
 import UploadTrigger from './UploadTrigger';
-import { prefix, ajaxUpload, defaultProps, getUnhandledProps } from '../utils';
+import { compose, prefix, ajaxUpload, defaultProps, getUnhandledProps } from '../utils';
 import { getFiles, guid } from './utils';
 import { UploaderProps, FileType } from './Uploader.d';
 
@@ -285,7 +284,7 @@ class Uploader extends React.Component<UploaderProps, UploaderState> {
       fileList: nextFileList
     };
 
-    if (nextFile.progress) {
+    if (nextFile.progress || nextFile.status === 'error') {
       const { fileMap } = this.state;
 
       fileMap[nextFile.fileKey] = {

package/src/utils/defaultProps.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { setDisplayName, wrapDisplayName } from 'recompose';
+import { setDisplayName, wrapDisplayName } from './recompose';
 import { getClassNamePrefix } from './prefix';
 import { StandardProps } from '../@types/common';
 import extendReactStatics from './extendReactStatics';

package/src/utils/index.ts

@@ -3,6 +3,7 @@ export * from './htmlPropsUtils';
 
 export { default as withStyleProps } from './withStyleProps';
 
+export * from './recompose';
 export { default as prefix, defaultClassPrefix, getClassNamePrefix, globalKey } from './prefix';
 export { default as createChainedFunction } from './createChainedFunction';
 export { default as defaultProps } from './defaultProps';

package/src/utils/recompose.ts

@@ -0,0 +1,52 @@
+import React from 'react';
+
+interface ComponentEnhancer<TInner, TOutter> {
+  (component: React.ComponentType<TInner>): React.ComponentClass<TOutter>;
+}
+
+export function compose<TInner, TOutter>(...funcs: Function[]): ComponentEnhancer<TInner, TOutter> {
+  return funcs.reduce(
+    (a, b) => (...args) => a(b(...args)),
+    arg => arg
+  ) as ComponentEnhancer<TInner, TOutter>;
+}
+
+export function setStatic(
+  key: string,
+  value: any
+): <T extends React.ComponentType<any>>(component: T) => T {
+  return BaseComponent => {
+    /* eslint-disable no-param-reassign */
+    BaseComponent[key] = value;
+    /* eslint-enable no-param-reassign */
+    return BaseComponent;
+  };
+}
+
+export function setDisplayName(
+  displayName: string
+): <T extends React.ComponentType<any>>(component: T) => T {
+  return setStatic('displayName', displayName);
+}
+
+export function getDisplayName(component: React.ComponentType<any>): string {
+  if (typeof component === 'string') {
+    return component;
+  }
+
+  if (!component) {
+    return undefined;
+  }
+
+  return component.displayName || component.name || 'Component';
+}
+
+export function wrapDisplayName(component: React.ComponentType<any>, wrapperName: string): string {
+  return `${wrapperName}(${getDisplayName(component)})`;
+}
+
+export function setPropTypes<P>(
+  propTypes: React.ValidationMap<P>
+): <T extends React.ComponentType<P>>(component: T) => T {
+  return setStatic('propTypes', propTypes);
+}

package/src/utils/test/recomposeSpec.js

@@ -0,0 +1,107 @@
+// Ref: https://github.com/acdlite/recompose/tree/master/src/packages/recompose/__tests__
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  compose,
+  setStatic,
+  setDisplayName,
+  getDisplayName,
+  wrapDisplayName,
+  setPropTypes
+} from '../recompose';
+
+describe('compose', function() {
+  it('composes from right to left', () => {
+    const double = x => x * 2;
+    const square = x => x * x;
+    expect(compose(square)(5)).to.equal(25);
+    expect(compose(square, double)(5)).to.equal(100);
+    expect(compose(double, square, double)(5)).to.equal(200);
+  });
+
+  it('can be seeded with multiple arguments', () => {
+    const square = x => x * x;
+    const add = (x, y) => x + y;
+    expect(compose(square, add)(1, 2)).to.equal(9);
+  });
+
+  it('returns the identity function if given no arguments', () => {
+    expect(compose()(1, 2)).to.equal(1);
+    expect(compose()(3)).to.equal(3);
+    expect(compose()()).to.equal(undefined);
+  });
+
+  it('the first function if given only one', () => {
+    const fn = x => x * x;
+    expect(compose(fn)(3)).to.equal(fn(3));
+  });
+});
+
+describe('setStatic', () => {
+  it('sets a static property on the base component', () => {
+    const BaseComponent = () => <div />;
+    const NewComponent = setStatic('propTypes', { foo: PropTypes.object })(BaseComponent);
+
+    expect(NewComponent.propTypes).to.eql({
+      foo: PropTypes.object
+    });
+  });
+});
+
+describe('setDisplayName', () => {
+  it('sets a static property on the base component', () => {
+    const BaseComponent = () => <div />;
+    const NewComponent = setDisplayName('Foo')(BaseComponent);
+    expect(NewComponent.displayName).to.equal('Foo');
+  });
+});
+
+describe('getDisplayName', () => {
+  it('gets the display name of a React component', () => {
+    class SomeComponent extends React.Component {
+      render() {
+        return <div />;
+      }
+    }
+
+    class SomeOtherComponent extends React.Component {
+      static displayName = 'CustomDisplayName';
+      render() {
+        return <div />;
+      }
+    }
+
+    function YetAnotherComponent() {
+      return <div />;
+    }
+
+    expect(getDisplayName(SomeComponent)).to.equal('SomeComponent');
+    expect(getDisplayName(SomeOtherComponent)).to.equal('CustomDisplayName');
+    expect(getDisplayName(YetAnotherComponent)).to.equal('YetAnotherComponent');
+    expect(getDisplayName(() => <div />)).to.equal('Component');
+    expect(getDisplayName('div')).to.equal('div');
+  });
+});
+
+describe('wrapDisplayName', () => {
+  it('wraps the display name of a React component with the name of an HoC, Relay-style', () => {
+    class SomeComponent extends React.Component {
+      render() {
+        return <div />;
+      }
+    }
+
+    expect(wrapDisplayName(SomeComponent, 'someHoC')).to.equal('someHoC(SomeComponent)');
+  });
+});
+
+describe('setPropTypes', () => {
+  it(' sets a static property on the base component', () => {
+    const BaseComponent = () => <div />;
+    const NewComponent = setPropTypes({ foo: PropTypes.object })(BaseComponent);
+
+    expect(NewComponent.propTypes).to.eql({
+      foo: PropTypes.object
+    });
+  });
+});

package/src/utils/withStyleProps.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { setDisplayName, wrapDisplayName, setPropTypes } from 'recompose';
+import { setDisplayName, wrapDisplayName, setPropTypes } from './recompose';
 
 import { TypeAttributes } from '../@types/common';
 import prefix from './prefix';