From 4b3fae89e89f4bc8208b18b12a3b3258037c7adf Mon Sep 17 00:00:00 2001 From: Josh Howenstine Date: Fri, 1 Mar 2024 15:40:43 -0800 Subject: [PATCH] fix: remove circular dependency warnings when generating bundled files with Rollup --- .../@lightningjs/ui-components/index.d.ts | 2 +- .../src/components/Button/Button.d.ts | 2 +- .../src/components/Card/Card.d.ts | 3 ++- .../src/components/Card/CardRadio.d.ts | 3 ++- .../src/components/Card/CardSection.d.ts | 2 +- .../src/components/Card/CardTitle.d.ts | 3 ++- .../components/CardContent/CardContent.d.ts | 3 ++- .../components/GridOverlay/GridOverlay.d.ts | 2 +- .../InlineContent/InlineContent.d.ts | 2 +- .../src/components/Input/Input.d.ts | 3 ++- .../src/components/ListItem/ListItem.d.ts | 3 ++- .../components/ListItem/ListItemSlider.d.ts | 3 ++- .../src/components/Marquee/Marquee.d.ts | 2 +- .../components/MetadataBase/MetadataBase.d.ts | 3 ++- .../MetadataCardContent.d.ts | 3 ++- .../src/components/Provider/Provider.d.ts | 2 +- .../ScrollWrapper/ScrollSlider.d.ts | 2 +- .../ScrollWrapper/ScrollWrapper.d.ts | 18 ++---------------- .../ScrollWrapper/ScrollWrapper.style.d.ts | 17 +++++++++++++++++ .../src/components/ScrollWrapper/index.d.ts | 4 ++-- .../src/components/TabBar/Tab.d.ts | 3 ++- .../components/TextBox/TextBox.content.d.ts | 13 +++++++++++++ .../src/components/TextBox/TextBox.d.ts | 19 +++---------------- .../src/components/TextBox/TextBox.style.d.ts | 9 +++++++++ .../src/components/TextBox/index.d.ts | 4 ++-- .../src/components/TitleRow/TitleRow.d.ts | 2 +- .../src/components/Tooltip/Tooltip.d.ts | 3 ++- .../ui-components/src/components/index.d.ts | 7 +++++-- 28 files changed, 84 insertions(+), 58 deletions(-) create mode 100644 packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.style.d.ts create mode 100644 packages/@lightningjs/ui-components/src/components/TextBox/TextBox.content.d.ts create mode 100644 packages/@lightningjs/ui-components/src/components/TextBox/TextBox.style.d.ts diff --git a/packages/@lightningjs/ui-components/index.d.ts b/packages/@lightningjs/ui-components/index.d.ts index e17c35be9..eec50849c 100644 --- a/packages/@lightningjs/ui-components/index.d.ts +++ b/packages/@lightningjs/ui-components/index.d.ts @@ -19,7 +19,7 @@ export * from './src/components'; export * from './src/mixins'; export * from './src/types/lui'; -export * from './src/globals'; +// export * from './src/globals'; // exports without type definitions export { default as utils } from './src/utils'; diff --git a/packages/@lightningjs/ui-components/src/components/Button/Button.d.ts b/packages/@lightningjs/ui-components/src/components/Button/Button.d.ts index 609a374be..6ceacfdc0 100644 --- a/packages/@lightningjs/ui-components/src/components/Button/Button.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Button/Button.d.ts @@ -19,7 +19,7 @@ import lng from '@lightningjs/core'; import { Color, StylePartial } from '../../types/lui'; import Surface, { SurfaceStyle } from '../Surface'; -import type { TextBoxStyle } from '../TextBox'; // text in Button is all using our own version of TextBox +import type TextBoxStyle from '../TextBox/TextBox.style'; // text in Button is all using our own version of TextBox type ButtonStyle = SurfaceStyle & { justify: 'center' | 'left' | 'right'; diff --git a/packages/@lightningjs/ui-components/src/components/Card/Card.d.ts b/packages/@lightningjs/ui-components/src/components/Card/Card.d.ts index 39c228943..585b8a6e7 100644 --- a/packages/@lightningjs/ui-components/src/components/Card/Card.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Card/Card.d.ts @@ -18,7 +18,8 @@ import type lng from '@lightningjs/core'; import Surface, { SurfaceStyle } from '../Surface'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import { Color, StylePartial } from '../../types/lui'; type CardStyle = SurfaceStyle & { diff --git a/packages/@lightningjs/ui-components/src/components/Card/CardRadio.d.ts b/packages/@lightningjs/ui-components/src/components/Card/CardRadio.d.ts index 110182289..584733f17 100644 --- a/packages/@lightningjs/ui-components/src/components/Card/CardRadio.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Card/CardRadio.d.ts @@ -18,7 +18,8 @@ import lng from '@lightningjs/core'; import { StylePartial } from '../../types/lui'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import CardTitle, { CardTitleStyle } from './CardTitle'; type CardRadioStyle = CardTitleStyle & { diff --git a/packages/@lightningjs/ui-components/src/components/Card/CardSection.d.ts b/packages/@lightningjs/ui-components/src/components/Card/CardSection.d.ts index a38627b61..72bff8f2e 100644 --- a/packages/@lightningjs/ui-components/src/components/Card/CardSection.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Card/CardSection.d.ts @@ -20,7 +20,7 @@ import lng from '@lightningjs/core'; import Card, { CardStyle } from './Card'; import { StylePartial } from '../../types/lui'; import Icon from '../Icon'; -import { TextBoxStyle } from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; type CardSectionStyle = CardStyle & { iconHeight: number; diff --git a/packages/@lightningjs/ui-components/src/components/Card/CardTitle.d.ts b/packages/@lightningjs/ui-components/src/components/Card/CardTitle.d.ts index 60486b5ba..fa01085dd 100644 --- a/packages/@lightningjs/ui-components/src/components/Card/CardTitle.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Card/CardTitle.d.ts @@ -18,7 +18,8 @@ import lng from '@lightningjs/core'; import Card, { CardStyle } from './Card'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import { StylePartial } from '../../types/lui'; type CardTitleStyle = CardStyle & { diff --git a/packages/@lightningjs/ui-components/src/components/CardContent/CardContent.d.ts b/packages/@lightningjs/ui-components/src/components/CardContent/CardContent.d.ts index dd5db009e..f03dd9242 100644 --- a/packages/@lightningjs/ui-components/src/components/CardContent/CardContent.d.ts +++ b/packages/@lightningjs/ui-components/src/components/CardContent/CardContent.d.ts @@ -19,7 +19,8 @@ import lng from '@lightningjs/core'; import { Color, StylePartial } from '../../types/lui'; import Card, { CardStyle } from '../Card'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import MetadataBase from '../MetadataBase'; import Tile from '../Tile'; diff --git a/packages/@lightningjs/ui-components/src/components/GridOverlay/GridOverlay.d.ts b/packages/@lightningjs/ui-components/src/components/GridOverlay/GridOverlay.d.ts index fb6a05665..ba321e818 100644 --- a/packages/@lightningjs/ui-components/src/components/GridOverlay/GridOverlay.d.ts +++ b/packages/@lightningjs/ui-components/src/components/GridOverlay/GridOverlay.d.ts @@ -19,7 +19,7 @@ import lng from '@lightningjs/core'; import Base from '../Base'; import { StylePartial } from '../../types/lui'; -import { TextBoxStyle } from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; type GridOverlayStyle = { propertyTextStyle: TextBoxStyle; diff --git a/packages/@lightningjs/ui-components/src/components/InlineContent/InlineContent.d.ts b/packages/@lightningjs/ui-components/src/components/InlineContent/InlineContent.d.ts index d3f1c21d7..38a287808 100644 --- a/packages/@lightningjs/ui-components/src/components/InlineContent/InlineContent.d.ts +++ b/packages/@lightningjs/ui-components/src/components/InlineContent/InlineContent.d.ts @@ -20,7 +20,7 @@ import lng from '@lightningjs/core'; import Badge from '../Badge'; import Base from '../Base'; import { StylePartial } from '../../types/lui'; -import TextContent from '../TextBox/TextBox'; +import TextContent from '../TextBox/TextBox.content'; type JustifyContent = | 'flex-start' diff --git a/packages/@lightningjs/ui-components/src/components/Input/Input.d.ts b/packages/@lightningjs/ui-components/src/components/Input/Input.d.ts index fce102022..04ba6ad13 100644 --- a/packages/@lightningjs/ui-components/src/components/Input/Input.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Input/Input.d.ts @@ -18,7 +18,8 @@ import lng from '@lightningjs/core'; import Button, { ButtonStyle } from '../Button'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import { StylePartial } from '../../types/lui'; type InputStyle = ButtonStyle & { diff --git a/packages/@lightningjs/ui-components/src/components/ListItem/ListItem.d.ts b/packages/@lightningjs/ui-components/src/components/ListItem/ListItem.d.ts index 37edea7d1..2f10c1cec 100644 --- a/packages/@lightningjs/ui-components/src/components/ListItem/ListItem.d.ts +++ b/packages/@lightningjs/ui-components/src/components/ListItem/ListItem.d.ts @@ -18,7 +18,8 @@ import lng from '@lightningjs/core'; import Button, { ButtonStyle } from '../Button'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import { StylePartial } from '../../types/lui'; type LogoStyleObject = { diff --git a/packages/@lightningjs/ui-components/src/components/ListItem/ListItemSlider.d.ts b/packages/@lightningjs/ui-components/src/components/ListItem/ListItemSlider.d.ts index 7c3c395d7..007fa7990 100644 --- a/packages/@lightningjs/ui-components/src/components/ListItem/ListItemSlider.d.ts +++ b/packages/@lightningjs/ui-components/src/components/ListItem/ListItemSlider.d.ts @@ -18,7 +18,8 @@ import lng from '@lightningjs/core'; import { StylePartial } from '../../types/lui'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import ListItem, { ListItemStyle } from './ListItem'; import NestedSlider from './NestedSlider'; diff --git a/packages/@lightningjs/ui-components/src/components/Marquee/Marquee.d.ts b/packages/@lightningjs/ui-components/src/components/Marquee/Marquee.d.ts index 4ddfd46a7..f3b9e3f44 100644 --- a/packages/@lightningjs/ui-components/src/components/Marquee/Marquee.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Marquee/Marquee.d.ts @@ -19,7 +19,7 @@ import lng from '@lightningjs/core'; import Base from '../Base'; import { Color, StylePartial } from '../../types/lui'; -import { TextBoxStyle } from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; type MarqueeStyle = { /** @deprecated */ diff --git a/packages/@lightningjs/ui-components/src/components/MetadataBase/MetadataBase.d.ts b/packages/@lightningjs/ui-components/src/components/MetadataBase/MetadataBase.d.ts index 87193f2ee..ad1fff03e 100644 --- a/packages/@lightningjs/ui-components/src/components/MetadataBase/MetadataBase.d.ts +++ b/packages/@lightningjs/ui-components/src/components/MetadataBase/MetadataBase.d.ts @@ -19,7 +19,8 @@ import lng from '@lightningjs/core'; import Base from '../Base'; import { StylePartial } from '../../types/lui'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import Icon from '../Icon'; type MetadataBaseStyle = { diff --git a/packages/@lightningjs/ui-components/src/components/MetadataCardContent/MetadataCardContent.d.ts b/packages/@lightningjs/ui-components/src/components/MetadataCardContent/MetadataCardContent.d.ts index 1b09dafbf..ebdc25e5a 100644 --- a/packages/@lightningjs/ui-components/src/components/MetadataCardContent/MetadataCardContent.d.ts +++ b/packages/@lightningjs/ui-components/src/components/MetadataCardContent/MetadataCardContent.d.ts @@ -19,7 +19,8 @@ import lng from '@lightningjs/core'; import MetadataBase, { MetadataBaseStyle } from '../MetadataBase'; import Provider, { ProviderStyle } from '../Provider'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import { StylePartial } from '../../types/lui'; type MetadataCardContentStyle = MetadataBaseStyle & { diff --git a/packages/@lightningjs/ui-components/src/components/Provider/Provider.d.ts b/packages/@lightningjs/ui-components/src/components/Provider/Provider.d.ts index ccd03f83a..be79eb4e6 100644 --- a/packages/@lightningjs/ui-components/src/components/Provider/Provider.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Provider/Provider.d.ts @@ -18,7 +18,7 @@ import lng from '@lightningjs/core'; import Base from '../Base'; -import { TextBoxStyle } from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import { Color, StylePartial } from '../../types/lui'; type ProviderStyle = { diff --git a/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollSlider.d.ts b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollSlider.d.ts index 2c8a75c66..9c9814b58 100644 --- a/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollSlider.d.ts +++ b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollSlider.d.ts @@ -18,7 +18,7 @@ import lng from '@lightningjs/core'; import Slider, { SliderStyle } from '../Slider'; -import { ScrollWrapperStyle } from './ScrollWrapper'; +import ScrollWrapperStyle from './ScrollWrapper.style'; import { StylePartial } from '../../types/lui'; type ScrollSliderStyle = SliderStyle & { diff --git a/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.d.ts b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.d.ts index 7614003ff..540f456d0 100644 --- a/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.d.ts +++ b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.d.ts @@ -19,22 +19,8 @@ import lng from '@lightningjs/core'; import ScrollSlider from './ScrollSlider'; import Base from '../Base'; -import { TextBoxStyle } from '../TextBox'; import { StylePartial } from '../../types/lui'; - -type ScrollWrapperStyle = { - textStyle: TextBoxStyle; - scrollBarW: number; - scrollBarH: number; - fadeHeight: 100; - scroll: { - timingFunction: string; - duration: number; - }; - contentMarginTop: number; - contentMarginLeft: number; - sliderMarginLeft: number; -}; +import ScrollWrapperStyle from './ScrollWrapper.style'; declare namespace ScrollWrapper { export interface TemplateSpec extends Base.TemplateSpec { @@ -161,4 +147,4 @@ declare class ScrollWrapper< get _ScrollableText(): lng.Component; } -export { ScrollWrapper as default, ScrollWrapperStyle }; +export { ScrollWrapper as default }; diff --git a/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.style.d.ts b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.style.d.ts new file mode 100644 index 000000000..d2ab4e546 --- /dev/null +++ b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/ScrollWrapper.style.d.ts @@ -0,0 +1,17 @@ +import type TextBoxStyle from '../TextBox/TextBox.style'; + +type ScrollWrapperStyle = { + textStyle: TextBoxStyle; + scrollBarW: number; + scrollBarH: number; + fadeHeight: 100; + scroll: { + timingFunction: string; + duration: number; + }; + contentMarginTop: number; + contentMarginLeft: number; + sliderMarginLeft: number; +}; + +export { ScrollWrapperStyle as default } \ No newline at end of file diff --git a/packages/@lightningjs/ui-components/src/components/ScrollWrapper/index.d.ts b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/index.d.ts index 8db8dd8a9..2dc2f2282 100644 --- a/packages/@lightningjs/ui-components/src/components/ScrollWrapper/index.d.ts +++ b/packages/@lightningjs/ui-components/src/components/ScrollWrapper/index.d.ts @@ -16,6 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import ScrollWrapper, { ScrollWrapperStyle } from './ScrollWrapper'; +import ScrollWrapper from './ScrollWrapper'; -export { ScrollWrapper as default, ScrollWrapperStyle }; +export { ScrollWrapper as default }; diff --git a/packages/@lightningjs/ui-components/src/components/TabBar/Tab.d.ts b/packages/@lightningjs/ui-components/src/components/TabBar/Tab.d.ts index 6da806f53..dd3052f9d 100644 --- a/packages/@lightningjs/ui-components/src/components/TabBar/Tab.d.ts +++ b/packages/@lightningjs/ui-components/src/components/TabBar/Tab.d.ts @@ -20,7 +20,8 @@ import lng from '@lightningjs/core'; import { Color, StylePartial } from '../../types/lui'; import Surface, { SurfaceStyle } from '../Surface'; // text should be using our own version of TextBox -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; import Icon from '../Icon'; type TabStyle = SurfaceStyle & { diff --git a/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.content.d.ts b/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.content.d.ts new file mode 100644 index 000000000..eaf0691e9 --- /dev/null +++ b/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.content.d.ts @@ -0,0 +1,13 @@ +import lng from '@lightningjs/core'; + +type ContentBase = { + title?: string; + announce?: string; + style?: lng.textures.TextTexture.Settings | string; +}; + +type TextContent = + | string + | (ContentBase & ({ text: string } | { icon: string } | { badge: string })); + +export { TextContent as default } \ No newline at end of file diff --git a/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.d.ts b/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.d.ts index 8d6505b22..406c7fcb0 100644 --- a/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.d.ts +++ b/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.d.ts @@ -21,22 +21,9 @@ import Base from '../Base'; import { StylePartial } from '../../types/lui'; import Marquee from '../Marquee'; import InlineContent from '../InlineContent'; +import TextContent from './TextBox.content'; +import TextBoxStyle from './TextBox.style'; -type ContentBase = { - title?: string; - announce?: string; - style?: lng.textures.TextTexture.Settings | string; -}; - -type TextContent = - | string - | (ContentBase & ({ text: string } | { icon: string } | { badge: string })); - -type TextBoxStyle = { - offsetY: number; - offsetX: number; - textStyle: lng.textures.TextTexture.Settings | string; -}; declare namespace TextBox { export interface TemplateSpec extends Base.TemplateSpec { @@ -123,4 +110,4 @@ declare class TextBox< get _Text(): TextBox; } -export { TextBox as default, TextBoxStyle, TextContent }; +export { TextBox as default }; diff --git a/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.style.d.ts b/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.style.d.ts new file mode 100644 index 000000000..c36222e41 --- /dev/null +++ b/packages/@lightningjs/ui-components/src/components/TextBox/TextBox.style.d.ts @@ -0,0 +1,9 @@ +import lng from '@lightningjs/core'; + +type TextBoxStyle = { + offsetY: number; + offsetX: number; + textStyle: lng.textures.TextTexture.Settings | string; +}; + +export { TextBoxStyle as default } diff --git a/packages/@lightningjs/ui-components/src/components/TextBox/index.d.ts b/packages/@lightningjs/ui-components/src/components/TextBox/index.d.ts index c6b42dbdf..4e469833a 100644 --- a/packages/@lightningjs/ui-components/src/components/TextBox/index.d.ts +++ b/packages/@lightningjs/ui-components/src/components/TextBox/index.d.ts @@ -16,6 +16,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import TextBox, { TextBoxStyle, TextContent } from './TextBox'; +import TextBox from './TextBox'; -export { TextBox as default, TextBoxStyle, TextContent }; +export { TextBox as default }; diff --git a/packages/@lightningjs/ui-components/src/components/TitleRow/TitleRow.d.ts b/packages/@lightningjs/ui-components/src/components/TitleRow/TitleRow.d.ts index 9927686cd..5a33cbc3b 100644 --- a/packages/@lightningjs/ui-components/src/components/TitleRow/TitleRow.d.ts +++ b/packages/@lightningjs/ui-components/src/components/TitleRow/TitleRow.d.ts @@ -21,7 +21,7 @@ import type Row from '../Row'; import FocusManager from '../FocusManager'; import type { NavigationManagerStyle } from '../NavigationManager/NavigationManager'; import type { StylePartial } from '../../types/lui'; -import type { TextBoxStyle } from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; // Why does `TitleRow` extend `Row` but use style props from `NavigationManager`? /** diff --git a/packages/@lightningjs/ui-components/src/components/Tooltip/Tooltip.d.ts b/packages/@lightningjs/ui-components/src/components/Tooltip/Tooltip.d.ts index eb4b3cbe8..6fb1f5f89 100644 --- a/packages/@lightningjs/ui-components/src/components/Tooltip/Tooltip.d.ts +++ b/packages/@lightningjs/ui-components/src/components/Tooltip/Tooltip.d.ts @@ -19,7 +19,8 @@ import lng from '@lightningjs/core'; import Base from '../Base'; import { Color, StylePartial } from '../../types/lui'; -import TextBox, { TextBoxStyle } from '../TextBox'; +import TextBox from '../TextBox'; +import type TextBoxStyle from '../TextBox/TextBox.style'; type TooltipStyle = { backgroundColor: Color; diff --git a/packages/@lightningjs/ui-components/src/components/index.d.ts b/packages/@lightningjs/ui-components/src/components/index.d.ts index e9db2c8b7..4287d18d3 100644 --- a/packages/@lightningjs/ui-components/src/components/index.d.ts +++ b/packages/@lightningjs/ui-components/src/components/index.d.ts @@ -85,12 +85,15 @@ export { default as ProgressBar, ProgressBarStyle } from './ProgressBar'; export { default as Provider, ProviderStyle } from './Provider'; export { default as Radio, RadioStyle } from './Radio'; export { default as Row } from './Row'; -export { default as ScrollWrapper, ScrollWrapperStyle } from './ScrollWrapper'; +export { default as ScrollWrapper } from './ScrollWrapper'; +export { default as ScrollWrapperStyle } from './ScrollWrapper/ScrollWrapper.style'; export { default as Shadow, ShadowStyle } from './Shadow'; export { default as Slider, SliderStyle } from './Slider'; export { default as Surface, SurfaceStyle } from './Surface'; export { default as TabBar, TabBarStyle, Tab, TabStyle } from './TabBar'; -export { default as TextBox, TextBoxStyle, TextContent } from './TextBox'; +export { default as TextBox } from './TextBox'; +export { default as TextBoxStyle } from './TextBox/TextBox.style'; +export { default as TextContent } from './TextBox/TextBox.content'; export { default as Tile, TileStyle } from './Tile'; export { default as TitleRow, TitleRowStyle } from './TitleRow'; export { default as Toggle, ToggleStyle } from './Toggle';