diff --git a/types/react-sketchapp/index.d.ts b/types/react-sketchapp/index.d.ts index e16ecbf882..e8c1441e6e 100644 --- a/types/react-sketchapp/index.d.ts +++ b/types/react-sketchapp/index.d.ts @@ -331,4 +331,4 @@ export const Platform: { }; // Svg, similar to https://github.com/react-native-community/react-native-svg -export { default as Svg } from './lib/components/Svg'; +export { default as Svg, SvgProps } from './lib/components/Svg'; diff --git a/types/react-sketchapp/lib/components/Svg/Circle.d.ts b/types/react-sketchapp/lib/components/Svg/Circle.d.ts index b085967ba7..50a9c00198 100644 --- a/types/react-sketchapp/lib/components/Svg/Circle.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Circle.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps, NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/ClipPath.d.ts b/types/react-sketchapp/lib/components/Svg/ClipPath.d.ts index 882124796d..63d14714fc 100644 --- a/types/react-sketchapp/lib/components/Svg/ClipPath.d.ts +++ b/types/react-sketchapp/lib/components/Svg/ClipPath.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); export interface ClipPathProps { id: string; diff --git a/types/react-sketchapp/lib/components/Svg/Defs.d.ts b/types/react-sketchapp/lib/components/Svg/Defs.d.ts index 9303571ecf..ca794ba0e9 100644 --- a/types/react-sketchapp/lib/components/Svg/Defs.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Defs.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); export interface DefsProps { children: React.ReactChild[] | React.ReactChild; diff --git a/types/react-sketchapp/lib/components/Svg/Ellipse.d.ts b/types/react-sketchapp/lib/components/Svg/Ellipse.d.ts index ec2559296f..8c5090813b 100644 --- a/types/react-sketchapp/lib/components/Svg/Ellipse.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Ellipse.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps, NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/G.d.ts b/types/react-sketchapp/lib/components/Svg/G.d.ts index 803bc8249e..c7c740d881 100644 --- a/types/react-sketchapp/lib/components/Svg/G.d.ts +++ b/types/react-sketchapp/lib/components/Svg/G.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps, FontProps } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Image.d.ts b/types/react-sketchapp/lib/components/Svg/Image.d.ts index 13d5b581d3..ebec62b141 100644 --- a/types/react-sketchapp/lib/components/Svg/Image.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Image.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Line.d.ts b/types/react-sketchapp/lib/components/Svg/Line.d.ts index 5f291384e3..7e9a310ba0 100644 --- a/types/react-sketchapp/lib/components/Svg/Line.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Line.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps, NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/LinearGradient.d.ts b/types/react-sketchapp/lib/components/Svg/LinearGradient.d.ts index 8fda5450a2..75fcd251fa 100644 --- a/types/react-sketchapp/lib/components/Svg/LinearGradient.d.ts +++ b/types/react-sketchapp/lib/components/Svg/LinearGradient.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Path.d.ts b/types/react-sketchapp/lib/components/Svg/Path.d.ts index 62a9837b1f..bf2a062a25 100644 --- a/types/react-sketchapp/lib/components/Svg/Path.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Path.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps as DefaultPathProps } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Pattern.d.ts b/types/react-sketchapp/lib/components/Svg/Pattern.d.ts index 6fcc7d8339..8a63a44fe4 100644 --- a/types/react-sketchapp/lib/components/Svg/Pattern.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Pattern.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Polygon.d.ts b/types/react-sketchapp/lib/components/Svg/Polygon.d.ts index 49b7bb8d7b..1cd99e64fd 100644 --- a/types/react-sketchapp/lib/components/Svg/Polygon.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Polygon.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Polyline.d.ts b/types/react-sketchapp/lib/components/Svg/Polyline.d.ts index a63ed7d942..adebaa0f5b 100644 --- a/types/react-sketchapp/lib/components/Svg/Polyline.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Polyline.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/RadialGradient.d.ts b/types/react-sketchapp/lib/components/Svg/RadialGradient.d.ts index 01a678a97d..4d689cd7ed 100644 --- a/types/react-sketchapp/lib/components/Svg/RadialGradient.d.ts +++ b/types/react-sketchapp/lib/components/Svg/RadialGradient.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Rect.d.ts b/types/react-sketchapp/lib/components/Svg/Rect.d.ts index b7896dc688..cfe25ac1c6 100644 --- a/types/react-sketchapp/lib/components/Svg/Rect.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Rect.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps, NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Stop.d.ts b/types/react-sketchapp/lib/components/Svg/Stop.d.ts index 8a9c607105..a019562d09 100644 --- a/types/react-sketchapp/lib/components/Svg/Stop.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Stop.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/Svg.d.ts b/types/react-sketchapp/lib/components/Svg/Svg.d.ts index 64e176757a..95cb5743f9 100644 --- a/types/react-sketchapp/lib/components/Svg/Svg.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Svg.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { ViewProps } from '../../../index'; import Circle, { CircleProps } from './Circle'; @@ -16,7 +16,7 @@ import Polyline, { PolylineProps } from './Polyline'; import RadialGradient, { RadialGradientProps } from './RadialGradient'; import Rect, { RectProps } from './Rect'; import Stop, { StopProps } from './Stop'; -import Symbol, { SymbolProps } from './Symbol'; +import SvgSymbol, { SymbolProps } from './Symbol'; import Text, { TextProps } from './Text'; import TextPath, { TextPathProps } from './TextPath'; import TSpan, { TSpanProps } from './TSpan'; @@ -48,7 +48,7 @@ export default class Svg extends React.Component { static RadialGradient: new (props: RadialGradientProps) => RadialGradient; static Rect: new (props: RectProps) => Rect; static Stop: new (props: StopProps) => Stop; - static Symbol: new (props: SymbolProps) => Symbol; + static Symbol: new (props: SymbolProps) => SvgSymbol; static Text: new (props: TextProps) => Text; static TextPath: new (props: TextPathProps) => TextPath; static TSpan: new (props: TSpanProps) => TSpan; diff --git a/types/react-sketchapp/lib/components/Svg/Symbol.d.ts b/types/react-sketchapp/lib/components/Svg/Symbol.d.ts index e583986aa6..ce338ed4b5 100644 --- a/types/react-sketchapp/lib/components/Svg/Symbol.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Symbol.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); export interface SymbolProps { id: string; diff --git a/types/react-sketchapp/lib/components/Svg/TSpan.d.ts b/types/react-sketchapp/lib/components/Svg/TSpan.d.ts index d06a9bac88..dcd36aedab 100644 --- a/types/react-sketchapp/lib/components/Svg/TSpan.d.ts +++ b/types/react-sketchapp/lib/components/Svg/TSpan.d.ts @@ -1,9 +1,8 @@ -import React from 'react'; +import React = require('react'); -import { TextProps } from './props'; - -export interface TSpanProps extends TextProps {} +import { TextProps as TSpanProps } from './props'; +export { TSpanProps }; export default class TSpan extends React.Component { getChildContext(): { isInAParentText: boolean }; } diff --git a/types/react-sketchapp/lib/components/Svg/Text.d.ts b/types/react-sketchapp/lib/components/Svg/Text.d.ts index 9b46892163..8c17e32ab3 100644 --- a/types/react-sketchapp/lib/components/Svg/Text.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Text.d.ts @@ -1,8 +1,8 @@ -import React from 'react'; +import React = require('react'); -import { TextProps as DefaultTextProps } from './props'; +import { TextProps } from './props'; -export interface TextProps extends DefaultTextProps {} +export { TextProps }; export default class Text extends React.Component { getChildContext(): { isInAParentText: boolean }; diff --git a/types/react-sketchapp/lib/components/Svg/TextPath.d.ts b/types/react-sketchapp/lib/components/Svg/TextPath.d.ts index 6e50e0a147..665f6d4900 100644 --- a/types/react-sketchapp/lib/components/Svg/TextPath.d.ts +++ b/types/react-sketchapp/lib/components/Svg/TextPath.d.ts @@ -1,7 +1,7 @@ -import React from 'react'; +import React = require('react'); -import { TextPathProps as DefaultTextPathProps } from './props'; +import { TextPathProps } from './props'; -export interface TextPathProps extends DefaultTextPathProps {} +export { TextPathProps }; export default class TextPath extends React.Component {} diff --git a/types/react-sketchapp/lib/components/Svg/Use.d.ts b/types/react-sketchapp/lib/components/Svg/Use.d.ts index 1adcb053e0..d81c5bc729 100644 --- a/types/react-sketchapp/lib/components/Svg/Use.d.ts +++ b/types/react-sketchapp/lib/components/Svg/Use.d.ts @@ -1,4 +1,4 @@ -import React from 'react'; +import React = require('react'); import { PathProps, NumberProp } from './props'; diff --git a/types/react-sketchapp/lib/components/Svg/index.d.ts b/types/react-sketchapp/lib/components/Svg/index.d.ts index f21cf8f26e..f32aeaace2 100644 --- a/types/react-sketchapp/lib/components/Svg/index.d.ts +++ b/types/react-sketchapp/lib/components/Svg/index.d.ts @@ -1,3 +1,5 @@ -import Svg from './Svg'; +import Svg, { SvgProps } from './Svg'; + +export { SvgProps }; export default Svg;