diff --git a/packages/main/__karma_snapshots__/ActionSheet.md b/packages/main/__karma_snapshots__/ActionSheet.md index aee2dc8845c..86b2812a780 100644 --- a/packages/main/__karma_snapshots__/ActionSheet.md +++ b/packages/main/__karma_snapshots__/ActionSheet.md @@ -8,14 +8,14 @@ - +
- - + +
    diff --git a/packages/main/__karma_snapshots__/AnalyticalCard.md b/packages/main/__karma_snapshots__/AnalyticalCard.md index 1ba4659da51..e351fea45bc 100644 --- a/packages/main/__karma_snapshots__/AnalyticalCard.md +++ b/packages/main/__karma_snapshots__/AnalyticalCard.md @@ -45,7 +45,7 @@
    - + Target @@ -61,7 +61,7 @@
    - + Deviation @@ -80,7 +80,7 @@
    - + I'm a content! diff --git a/packages/main/__karma_snapshots__/Avatar.md b/packages/main/__karma_snapshots__/Avatar.md index 39c067b45b3..d882c97f999 100644 --- a/packages/main/__karma_snapshots__/Avatar.md +++ b/packages/main/__karma_snapshots__/Avatar.md @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -200,7 +200,7 @@ - + JD diff --git a/packages/main/__karma_snapshots__/Badge.md b/packages/main/__karma_snapshots__/Badge.md index b4d23a5c9c6..75a382d30a4 100644 --- a/packages/main/__karma_snapshots__/Badge.md +++ b/packages/main/__karma_snapshots__/Badge.md @@ -24,8 +24,8 @@ - - + + My Badge diff --git a/packages/main/__karma_snapshots__/Carousel.md b/packages/main/__karma_snapshots__/Carousel.md index 6b7d9b2a4fa..46e6d955c48 100644 --- a/packages/main/__karma_snapshots__/Carousel.md +++ b/packages/main/__karma_snapshots__/Carousel.md @@ -8,7 +8,7 @@ -
    +
    @@ -103,7 +103,7 @@ -
    +
    @@ -197,7 +197,7 @@ -
    +
    @@ -292,7 +292,7 @@ -
    +
    @@ -387,7 +387,7 @@ -
    +
    @@ -482,7 +482,7 @@ -
    +
    diff --git a/packages/main/__karma_snapshots__/FilterBar.md b/packages/main/__karma_snapshots__/FilterBar.md index 4fa0ae09594..8884458a3f4 100644 --- a/packages/main/__karma_snapshots__/FilterBar.md +++ b/packages/main/__karma_snapshots__/FilterBar.md @@ -29,8 +29,8 @@
    - @@ -148,8 +148,8 @@
    - @@ -274,8 +274,8 @@
    - diff --git a/packages/main/__karma_snapshots__/MessageBox.md b/packages/main/__karma_snapshots__/MessageBox.md index 3197cd43b95..9b91aea4e65 100644 --- a/packages/main/__karma_snapshots__/MessageBox.md +++ b/packages/main/__karma_snapshots__/MessageBox.md @@ -8,7 +8,7 @@ -
    +
    @@ -25,7 +25,7 @@
    - + Confirm - OK @@ -64,7 +64,7 @@ -
    +
    @@ -81,7 +81,7 @@
    - + Confirm - Cancel @@ -120,7 +120,7 @@ -
    +
    @@ -137,7 +137,7 @@
    - + Success @@ -169,7 +169,7 @@ -
    +
    @@ -186,7 +186,7 @@
    - + Warning @@ -218,7 +218,7 @@ -
    +
    @@ -235,7 +235,7 @@
    - + Error @@ -267,7 +267,7 @@ -
    +
    @@ -284,7 +284,7 @@
    - + Information @@ -316,7 +316,7 @@ -
    +
    @@ -333,7 +333,7 @@
    - + Custom @@ -372,7 +372,7 @@ -
    +
    @@ -389,7 +389,7 @@
    - + Custom Success @@ -435,7 +435,7 @@ -
    +
    @@ -452,7 +452,7 @@
    - + No Title diff --git a/packages/main/__karma_snapshots__/ObjectPage.md b/packages/main/__karma_snapshots__/ObjectPage.md index c1f44955f82..ceb57e1d79b 100644 --- a/packages/main/__karma_snapshots__/ObjectPage.md +++ b/packages/main/__karma_snapshots__/ObjectPage.md @@ -8,7 +8,7 @@ -
    +
    @@ -38,21 +38,21 @@ - + Address 1 - + Address 2 - + Address 3 @@ -334,7 +334,7 @@ -
    +
    @@ -364,21 +364,21 @@ - + Address 1 - + Address 2 - + Address 3 @@ -509,7 +509,7 @@ -
    +
    @@ -539,21 +539,21 @@ - + Address 1 - + Address 2 - + Address 3 @@ -726,7 +726,7 @@ -
    +
    @@ -790,7 +790,7 @@ -
    +
    @@ -830,7 +830,7 @@ -
    +
    diff --git a/packages/main/__karma_snapshots__/ObjectStatus.md b/packages/main/__karma_snapshots__/ObjectStatus.md index 458bd6a9e4d..327ec571a42 100644 --- a/packages/main/__karma_snapshots__/ObjectStatus.md +++ b/packages/main/__karma_snapshots__/ObjectStatus.md @@ -8,7 +8,7 @@ -
    +
    @@ -33,7 +33,7 @@ -
    +
    @@ -58,7 +58,7 @@ -
    +
    @@ -80,7 +80,7 @@ -
    +
    @@ -102,7 +102,7 @@ -
    +
    @@ -124,7 +124,7 @@ -
    +
    @@ -146,7 +146,7 @@ -
    +
    diff --git a/packages/main/__karma_snapshots__/ProgressIndicator.md b/packages/main/__karma_snapshots__/ProgressIndicator.md index d7f5008fde6..ccb5d82b462 100644 --- a/packages/main/__karma_snapshots__/ProgressIndicator.md +++ b/packages/main/__karma_snapshots__/ProgressIndicator.md @@ -8,7 +8,7 @@ -
    +
    @@ -33,7 +33,7 @@ -
    +
    @@ -57,7 +57,7 @@ -
    +
    @@ -81,7 +81,7 @@ -
    +
    @@ -105,7 +105,7 @@ -
    +
    @@ -129,7 +129,7 @@ -
    +
    @@ -153,7 +153,7 @@ -
    +
    diff --git a/packages/main/__karma_snapshots__/Text.md b/packages/main/__karma_snapshots__/Text.md index f1b26787ec6..0532192d60a 100644 --- a/packages/main/__karma_snapshots__/Text.md +++ b/packages/main/__karma_snapshots__/Text.md @@ -8,7 +8,7 @@ - + FioriText @@ -26,7 +26,7 @@ - + Lorem Ipsum dolor sit amed @@ -44,7 +44,7 @@ - + Lorem Ipsum dolor sit amed diff --git a/packages/main/__karma_snapshots__/VariantManagement.md b/packages/main/__karma_snapshots__/VariantManagement.md index 79e2f94a443..b8a91d90b03 100644 --- a/packages/main/__karma_snapshots__/VariantManagement.md +++ b/packages/main/__karma_snapshots__/VariantManagement.md @@ -25,8 +25,8 @@
    - diff --git a/packages/main/src/components/ActionSheet/index.tsx b/packages/main/src/components/ActionSheet/index.tsx index c5aac2edc15..cf358443267 100644 --- a/packages/main/src/components/ActionSheet/index.tsx +++ b/packages/main/src/components/ActionSheet/index.tsx @@ -66,7 +66,7 @@ export class ActionSheet extends Component { openBy={openBy} placementType={placement} style={style} - data-ui5-slot={this.props['data-ui5-slot']} + slot={this.props['slot']} >
      {Children.map(children, (child: ReactElement) => this.renderActionSheetButton(child))} diff --git a/packages/main/src/components/Avatar/index.tsx b/packages/main/src/components/Avatar/index.tsx index 38b5bdb8c5b..df5a4a424a2 100644 --- a/packages/main/src/components/Avatar/index.tsx +++ b/packages/main/src/components/Avatar/index.tsx @@ -97,7 +97,7 @@ export class Avatar extends PureComponent { tabIndex={0} onKeyDown={this.handleKeyDown} title={tooltip} - data-ui5-slot={this.props['data-ui5-slot']} + slot={this.props['slot']} > {initials ? initials : children} diff --git a/packages/main/src/components/Bar/index.tsx b/packages/main/src/components/Bar/index.tsx index 6bd48347b68..424d1aa1233 100644 --- a/packages/main/src/components/Bar/index.tsx +++ b/packages/main/src/components/Bar/index.tsx @@ -34,7 +34,7 @@ export class Bar extends Component { className={cssClasses.toString()} style={style} title={tooltip} - data-ui5-slot={this.props['data-ui5-slot']} + slot={this.props['slot']} >
      {renderContentLeft()} diff --git a/packages/main/src/components/Carousel/index.tsx b/packages/main/src/components/Carousel/index.tsx index 7e8f913ddb5..f2981b67c13 100644 --- a/packages/main/src/components/Carousel/index.tsx +++ b/packages/main/src/components/Carousel/index.tsx @@ -155,12 +155,7 @@ export class Carousel extends Component { } return ( -
      +
      {Children.count(children) > 1 && pageIndicatorPlacement === PlacementType.Top && ( { } return ( -
      +
      {children}
      ); diff --git a/packages/main/src/components/Grid/index.tsx b/packages/main/src/components/Grid/index.tsx index b2b9fba7d8c..8fdd095b4fd 100644 --- a/packages/main/src/components/Grid/index.tsx +++ b/packages/main/src/components/Grid/index.tsx @@ -178,12 +178,7 @@ export class Grid extends Component { } return ( -
      +
      {Children.map(children, this.renderGridElements)}
      ); diff --git a/packages/main/src/components/MessageBox/index.tsx b/packages/main/src/components/MessageBox/index.tsx index ad7d9d52544..3842767007a 100644 --- a/packages/main/src/components/MessageBox/index.tsx +++ b/packages/main/src/components/MessageBox/index.tsx @@ -128,7 +128,7 @@ export class MessageBox extends PureComponent { const title = this.getTitle(); return ( -
      +
      {!!icon &&
      {icon}
      } diff --git a/packages/main/src/components/ObjectPage/index.tsx b/packages/main/src/components/ObjectPage/index.tsx index a299fa0aa5e..94a5abf56a4 100644 --- a/packages/main/src/components/ObjectPage/index.tsx +++ b/packages/main/src/components/ObjectPage/index.tsx @@ -239,7 +239,7 @@ export class ObjectPage extends PureComponent = withStyles(styles)((props const textClass = classes[`text${state}`]; return ( -
      +
      {iconToRender &&
      {iconToRender}
      } {children !== null && children !== undefined && {children}}
      diff --git a/packages/main/src/components/Page/index.tsx b/packages/main/src/components/Page/index.tsx index e5ecccbe9fc..f93a943f11a 100644 --- a/packages/main/src/components/Page/index.tsx +++ b/packages/main/src/components/Page/index.tsx @@ -92,12 +92,7 @@ export class Page extends Component { pageContainer.put(classes[`background${backgroundDesign}`]); return ( -
      +
      {showHeader && (
      {renderCustomHeader && renderCustomHeader()} diff --git a/packages/main/src/components/ProgressIndicator/index.tsx b/packages/main/src/components/ProgressIndicator/index.tsx index 35c0e2cf0f8..df69a44e751 100644 --- a/packages/main/src/components/ProgressIndicator/index.tsx +++ b/packages/main/src/components/ProgressIndicator/index.tsx @@ -115,7 +115,7 @@ export class ProgressIndicator extends PureComponent className={wrapperClasses.valueOf()} style={progressBarContainerStyle} title={tooltip} - data-ui5-slot={this.props['data-ui5-slot']} + slot={this.props['slot']} >
      {percentValue <= 50 ? null : progressBarTextSpan} diff --git a/packages/main/src/components/SegmentedButton/index.tsx b/packages/main/src/components/SegmentedButton/index.tsx index e0420034e9f..ff91c5d8c99 100644 --- a/packages/main/src/components/SegmentedButton/index.tsx +++ b/packages/main/src/components/SegmentedButton/index.tsx @@ -128,7 +128,7 @@ export class SegmentedButton extends Component {Children.map(children, (item: any) => cloneElement(item, { diff --git a/packages/main/src/components/Spinner/index.tsx b/packages/main/src/components/Spinner/index.tsx index 8484bbe0453..47f5258820f 100644 --- a/packages/main/src/components/Spinner/index.tsx +++ b/packages/main/src/components/Spinner/index.tsx @@ -31,7 +31,7 @@ export const Spinner: FC = withStyles(styles)((props: SpinnerInter aria-valuemin={0} aria-valuemax={100} title={tooltip || 'Please wait'} - data-ui5-slot={props['data-ui5-slot']} + slot={props['slot']} > Loading...
      diff --git a/packages/main/src/components/Text/index.tsx b/packages/main/src/components/Text/index.tsx index b73bbc9fb7b..6b06636d343 100644 --- a/packages/main/src/components/Text/index.tsx +++ b/packages/main/src/components/Text/index.tsx @@ -41,12 +41,7 @@ export const Text: FC = withStyles(TextStyles)((props: TextInternalPr Object.assign(inlineStyles, style); } return ( - + {children} ); diff --git a/packages/main/src/interfaces/Fiori3CommonProps.ts b/packages/main/src/interfaces/Fiori3CommonProps.ts index e92f4ef8f31..782da43a5ec 100644 --- a/packages/main/src/interfaces/Fiori3CommonProps.ts +++ b/packages/main/src/interfaces/Fiori3CommonProps.ts @@ -1,5 +1,5 @@ import { CommonProps } from './CommonProps'; export interface Fiori3CommonProps extends CommonProps { - 'data-ui5-slot'?: string; + slot?: string; } diff --git a/packages/main/src/internal/withWebComponent.tsx b/packages/main/src/internal/withWebComponent.tsx index 2ff21f8e0e0..69a3af68024 100644 --- a/packages/main/src/internal/withWebComponent.tsx +++ b/packages/main/src/internal/withWebComponent.tsx @@ -219,7 +219,7 @@ export function withWebComponent(WebComponent): RefForwardingComponent, index) => cloneElement(item, { key: `${slot}-${index}`, - 'data-ui5-slot': slot + slot: slot }) ); } diff --git a/packages/main/src/webComponents/Input/index.tsx b/packages/main/src/webComponents/Input/index.tsx index bf4c680cc91..ac8dce2021c 100644 --- a/packages/main/src/webComponents/Input/index.tsx +++ b/packages/main/src/webComponents/Input/index.tsx @@ -1,6 +1,6 @@ import { Event } from '@ui5/webcomponents-react-base'; import UI5Input from '@ui5/webcomponents/dist/Input'; -import React, { FC } from 'react'; +import React, { FC, ReactNode } from 'react'; import { withWebComponent, WithWebComponentPropTypes } from '../../internal/withWebComponent'; import { InputType } from '../../lib/InputType'; import { ValueState } from '../../lib/ValueState'; @@ -18,7 +18,7 @@ export interface InputPropTypes extends WithWebComponentPropTypes { onInput?: (event: Event) => void; // @generated onSubmit?: (event: Event) => void; // @generated onSuggestionItemSelect?: (event: Event) => void; // @generated - icon?: any; // @generated + icon?: ReactNode; // @generated children?: string; } diff --git a/packages/main/src/webComponents/List/demo.stories.tsx b/packages/main/src/webComponents/List/demo.stories.tsx index 49bf4d2ceca..08cf0881a9d 100644 --- a/packages/main/src/webComponents/List/demo.stories.tsx +++ b/packages/main/src/webComponents/List/demo.stories.tsx @@ -1,4 +1,4 @@ -import { boolean, select } from '@storybook/addon-knobs'; +import { boolean, select, text } from '@storybook/addon-knobs'; import { action } from '@storybook/addon-actions'; import { storiesOf } from '@storybook/react'; import React from 'react'; @@ -10,11 +10,11 @@ import { ValueState } from '../../lib/ValueState'; storiesOf('UI5 Web Components | List', module).add('Generated default story', () => ( ( - null + )); diff --git a/packages/main/src/webComponents/Table/demo.stories.tsx b/packages/main/src/webComponents/Table/demo.stories.tsx index 938f8c66a8e..de4d7d3f1e6 100644 --- a/packages/main/src/webComponents/Table/demo.stories.tsx +++ b/packages/main/src/webComponents/Table/demo.stories.tsx @@ -18,34 +18,39 @@ storiesOf('UI5 Web Components | Table', module) .add('Default', () => ( - - - - - - - - - - , - - - - - - - - - - - - ]} columns={[ - Column 1} />, - Column 2} />, - Column 3} /> + + + , + + Column 2 + , + + Column 3 + ]} - /> + > + + + + + + + + + + + + + + + + + + + + + + +
      )); diff --git a/packages/main/src/webComponents/Table/index.tsx b/packages/main/src/webComponents/Table/index.tsx index 564db2acbc5..28803860c51 100644 --- a/packages/main/src/webComponents/Table/index.tsx +++ b/packages/main/src/webComponents/Table/index.tsx @@ -6,7 +6,7 @@ export interface TablePropTypes extends WithWebComponentPropTypes { showNoData?: boolean; // @generated noDataText?: string; // @generated stickyColumnHeader?: boolean; - rows?: ReactNode | ReactNode[]; + children?: ReactNode | ReactNode[]; columns?: ReactNode | ReactNode[]; } diff --git a/packages/main/src/webComponents/TableColumn/index.tsx b/packages/main/src/webComponents/TableColumn/index.tsx index 5f12e764379..6f58c3b8fdd 100644 --- a/packages/main/src/webComponents/TableColumn/index.tsx +++ b/packages/main/src/webComponents/TableColumn/index.tsx @@ -7,7 +7,7 @@ export interface TableColumnPropTypes extends WithWebComponentPropTypes { popinText?: string; // @generated demandPopin?: boolean; // @generated width?: CSSProperties['width'] | CSSProperties['height']; // @generated - header?: ReactNode; // @generated + children?: ReactNode; // @generated } const TableColumn: FC = withWebComponent(UI5TableColumn);