fix style tsx (temporary) (ant-design#1262)

* fix style tsx(temporary) * fix accordion tsx (temporary) & add style to wrapper * update snapshot caused by add style to accordion wrapper
lixiaoyang1992 · Apr 26, 2018 · 9d8cba9 · 9d8cba9
1 parent fb9b2fa
commit 9d8cba9
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 32 deletions.
diff --git a/components/accordion/PropsType.tsx b/components/accordion/PropsType.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 interface AccordionProps {
-  style?: React.CSSProperties;
+  styles?: any;
+  style?: any;
   /** below web only */
   className?: string;
   prefixCls?: string;
@@ -10,7 +11,6 @@ interface AccordionProps {
   openAnimation?: any;
   accordion?: boolean;
   onChange?: (x: any) => void;
-  styles?: any;
 }
 
 export default AccordionProps;
diff --git a/components/accordion/__tests__/__snapshots__/demo.test.js.snap b/components/accordion/__tests__/__snapshots__/demo.test.js.snap
@@ -11,10 +11,13 @@ exports[`renders ./components/accordion/demo/basic.tsx correctly 1`] = `
 >
   <View
     style={
-      Object {
-        "borderTopColor": "#ddd",
-        "borderTopWidth": 0.5,
-      }
+      Array [
+        undefined,
+        Object {
+          "borderTopColor": "#ddd",
+          "borderTopWidth": 0.5,
+        },
+      ]
     }
   >
     <View>

diff --git a/components/accordion/__tests__/__snapshots__/index.test.js.snap b/components/accordion/__tests__/__snapshots__/index.test.js.snap
@@ -3,10 +3,13 @@
 exports[`Accordion renders correctly 1`] = `
 <View
   style={
-    Object {
-      "borderTopColor": "#ddd",
-      "borderTopWidth": 0.5,
-    }
+    Array [
+      undefined,
+      Object {
+        "borderTopColor": "#ddd",
+        "borderTopWidth": 0.5,
+      },
+    ]
   }
 >
   <View>

diff --git a/components/accordion/index.tsx b/components/accordion/index.tsx
@@ -65,7 +65,7 @@ class Accordion extends React.Component<AccordionProps, any> {
   }
 
   render() {
-    const { children, styles, defaultActiveKey, activeKey } = this.props;
+    const { children, style, styles, defaultActiveKey, activeKey } = this.props;
     let defaultActiveSection;
     let activeSection;
     const headers = React.Children.map(children, (child: any, index) => {
@@ -83,7 +83,7 @@ class Accordion extends React.Component<AccordionProps, any> {
     });
 
     return (
-      <View style={styles.container}>
+      <View style={[style, styles.container]}>
         <RNAccordion
           initiallyActiveSection={defaultActiveSection}
           activeSection={activeSection}

diff --git a/components/badge/PropsType.tsx b/components/badge/PropsType.tsx
@@ -4,7 +4,7 @@ interface BadgeProps {
   corner?: boolean;
   dot?: boolean;
   text?: any;
-  style?: {};
+  style?: any;
   /** rn only */
   styles?: any;
   /** web only */

diff --git a/components/flex/PropsType.tsx b/components/flex/PropsType.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 export interface FlexProps {
   /** web only */
   prefixCls?: string;
-  style?: React.CSSProperties;
+  style?: any;
   /** web only */
   className?: string;
   direction?: 'row'|'row-reverse'|'column'|'column-reverse';
@@ -27,7 +27,7 @@ export interface FlexItemProps {
   /** web only */
   prefixCls?: string;
   className?: string;
-  style?: React.CSSProperties;
+  style?: any;
   onClick?: (e?: any) => void;
   children?: any;
   /* touchableWithoutFeedback prop */

diff --git a/components/grid/PropsType.tsx b/components/grid/PropsType.tsx
@@ -17,7 +17,6 @@ export interface GridProps {
   renderItem?: (dataItem: DataItem | undefined, itemIndex: number) => React.ReactElement<any>;
   prefixCls?: string;
   className?: string;
-  style?: React.CSSProperties;
   /** rn only **/
   styles?: any;
 }
diff --git a/components/input-item/PropsType.tsx b/components/input-item/PropsType.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 
 interface InputItemProps {
+  style?: any;
   /** web only */
   prefixCls?: string;
   /** web only */
   prefixListCls?: string;
-  style?: React.CSSProperties;
   /** web only */
   className?: string;
   type?: 'text'|'bankCard'|'phone'|'password'|'number'|'idcard'|'digit';

diff --git a/components/list-view/PropsType.tsx b/components/list-view/PropsType.tsx
@@ -19,12 +19,12 @@ interface Props {
   renderScrollComponent?: Function;
   scrollRenderAheadDistance?: number;
   onChangeVisibleRows?: Function;
+  style?: any;
   /** below web only */
   className?: string;
   prefixCls?: string;
   listPrefixCls?: string;
   listViewPrefixCls?: string;
-  style?: React.CSSProperties;
   contentContainerStyle?: React.CSSProperties;
   renderBodyComponent?: Function;
   renderSectionBodyWrapper?: Function;

diff --git a/components/list/PropsType.tsx b/components/list/PropsType.tsx
@@ -1,9 +1,9 @@
 import React, { ReactNode } from 'react';
 
 export interface ListProps {
+  style?: any;
   /** web only */
   prefixCls?: string;
-  style?: React.CSSProperties;
   /** web only */
   className?: string;
   children?: any;
@@ -42,7 +42,7 @@ export interface ListItemProps {
 }
 
 export interface BriefProps {
-  style?: React.CSSProperties;
+  style?: any;
   children?: any;
   wrap?: boolean;
   /** rn only */

diff --git a/components/pagination/PropsType.tsx b/components/pagination/PropsType.tsx
@@ -5,7 +5,7 @@ interface PaginationPropTypes {
   className?: string;
   mode?: 'button' | 'number' | 'pointer';
   simple?: Boolean;
-  style?: React.CSSProperties;
+  style?: any;
   current: number;
   total: number;
   prevText?: string;

diff --git a/components/progress/PropsType.tsx b/components/progress/PropsType.tsx
@@ -4,7 +4,7 @@ interface ProgressProps {
   percent?: number;
   position?: 'fixed' | 'normal';
   unfilled?: 'show' | 'hide';
-  style?: React.CSSProperties;
+  style?: any;
   /** rn only */
   wrapWidth?: number;
   styles?: any;

diff --git a/components/radio/PropsType.tsx b/components/radio/PropsType.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 export interface RadioProps {
-  style?: React.CSSProperties;
+  style?: any;
   defaultChecked?: boolean;
   checked?: boolean;
   disabled?: boolean;

diff --git a/components/result/PropsType.tsx b/components/result/PropsType.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 interface ResultProps {
-  style?: React.CSSProperties;
+  style?: any;
   imgUrl?: string;
   img?: React.ReactNode;
   title?: React.ReactNode;

diff --git a/components/result/index.web.tsx b/components/result/index.web.tsx
@@ -12,7 +12,18 @@ export default class Result extends React.Component<ResultProps, any> {
   };
 
   render() {
-    const { prefixCls, className, img, imgUrl, title, message, buttonText, buttonClick, buttonType } = this.props;
+    const {
+      prefixCls,
+      className,
+      img,
+      imgUrl,
+      title,
+      message,
+      buttonText,
+      buttonClick,
+      buttonType,
+      style,
+    } = this.props;
     const wrapCls = classNames({
       [`${prefixCls}`]: true,
       [className as string]: className,
@@ -26,7 +37,7 @@ export default class Result extends React.Component<ResultProps, any> {
     }
 
     return (
-      <div className={wrapCls} role="alert">
+      <div className={wrapCls} style={style} role="alert">
         {imgContent}
         {title ? <div className={`${prefixCls}-title`}>{title}</div> : null}
         {message ? <div className={`${prefixCls}-message`}>{message}</div> : null}

diff --git a/components/search-bar/PropsType.tsx b/components/search-bar/PropsType.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 function noop() {}
 
 export interface SearchBarProps {
+  style?: any;
   defaultValue?: string;
   value?: string;
   placeholder?: string;
@@ -19,7 +20,6 @@ export interface SearchBarProps {
   focused?: boolean;
   /** web only */
   prefixCls?: string;
-  style?: React.CSSProperties;
   className?: string;
   onClear?: Function;
 }

diff --git a/components/search-bar/index.web.tsx b/components/search-bar/index.web.tsx
@@ -164,7 +164,7 @@ export default class SearchBar extends React.Component<SearchBarProps, SearchBar
   render() {
     const {
       prefixCls, showCancelButton, disabled, placeholder,
-      cancelText, className,
+      cancelText, className, style,
     } = this.props;
 
     const { value, focus } = this.state;
@@ -187,7 +187,7 @@ export default class SearchBar extends React.Component<SearchBarProps, SearchBar
     });
 
     return (
-      <form onSubmit={this.onSubmit} className={wrapCls} ref="searchInputContainer">
+      <form onSubmit={this.onSubmit} className={wrapCls} style={style} ref="searchInputContainer">
         <div className={`${prefixCls}-input`}>
           <div className={`${prefixCls}-synthetic-ph`} ref="syntheticPh">
             <span className={`${prefixCls}-synthetic-ph-container`} ref="syntheticPhContainer">

diff --git a/components/textarea-item/PropsType.tsx b/components/textarea-item/PropsType.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 
 interface TextAreaItemProps {
+  style?: any;
   /** web only */
   prefixCls?: string;
   /** web only */
   prefixListCls?: string;
   /** web only */
   className?: string;
-  style?: React.CSSProperties;
   title?: React.ReactNode;
   maxLength?: number;
   /** web only */

diff --git a/components/white-space/PropsType.tsx b/components/white-space/PropsType.tsx
@@ -6,7 +6,7 @@ export interface WhiteSpaceProps {
   /** web only */
   prefixCls?: string;
   /** web only */
-  style?: React.CSSProperties;
+  style?: any;
   /** web only */
   className?: string;
 }

diff --git a/components/wing-blank/PropsType.tsx b/components/wing-blank/PropsType.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 export interface WingBlankProps {
   size?: 'sm'|'md'|'lg';
-  style?: React.CSSProperties;
+  style?: any;
   /** web only */
   prefixCls?: string;
   /** web only */