From e412500b28da820b3aea4c636d85a8dd36eeb711 Mon Sep 17 00:00:00 2001 From: YunBum SUNG Date: Sat, 25 Apr 2020 07:01:44 +0900 Subject: [PATCH] Rename ScrollerBasic, VirtualListBasic Enact-DCO-1.0-Signed-off-by: YB Sung (yb.sung@lge.com) --- Scroller/Scroller.js | 6 +++--- VirtualList/VirtualList.js | 10 +++++----- VirtualList/useThemeVirtualList.js | 2 +- samples/sampler/stories/default/VirtualList.js | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Scroller/Scroller.js b/Scroller/Scroller.js index 26df394e1..738fa3dfb 100644 --- a/Scroller/Scroller.js +++ b/Scroller/Scroller.js @@ -19,7 +19,7 @@ import {I18nContextDecorator} from '@enact/i18n/I18nDecorator'; import SpotlightContainerDecorator from '@enact/spotlight/SpotlightContainerDecorator'; import {ResizeContext} from '@enact/ui/Resizable'; -import {ScrollerBasic as UiScrollerBasic} from '@enact/ui/Scroller'; +import {ScrollerBase as UiScrollerBase} from '@enact/ui/Scroller'; import PropTypes from 'prop-types'; import React from 'react'; @@ -41,7 +41,7 @@ const nop = () => {}; * * @class Scroller * @memberof agate/Scroller - * @extends ui/Scroller.ScrollerBasic + * @extends ui/Scroller.ScrollerBase * @ui * @public */ @@ -72,7 +72,7 @@ let Scroller = (props) => {
- + {isVerticalScrollbarVisible ? : null}
diff --git a/VirtualList/VirtualList.js b/VirtualList/VirtualList.js index f3fea95b3..ecbf94cfc 100644 --- a/VirtualList/VirtualList.js +++ b/VirtualList/VirtualList.js @@ -9,7 +9,7 @@ import {I18nContextDecorator} from '@enact/i18n/I18nDecorator'; import SpotlightContainerDecorator from '@enact/spotlight/SpotlightContainerDecorator'; import {ResizeContext} from '@enact/ui/Resizable'; -import {gridListItemSizeShape, itemSizesShape, VirtualListBasic as UiVirtualListBasic} from '@enact/ui/VirtualList'; +import {gridListItemSizeShape, itemSizesShape, VirtualListBase as UiVirtualListBase} from '@enact/ui/VirtualList'; import PropTypes from 'prop-types'; import React from 'react'; import warning from 'warning'; @@ -27,7 +27,7 @@ const nop = () => {}; * * @class VirtualList * @memberof agate/VirtualList - * @extends ui/VirtualList.VirtualListBasic + * @extends ui/VirtualList.VirtualListBase * @ui * @public */ @@ -76,7 +76,7 @@ let VirtualList = ({itemSize, role, ...rest}) => {
- + {isVerticalScrollbarVisible ? : null}
@@ -486,7 +486,7 @@ VirtualList.defaultProps = { * * @class VirtualGridList * @memberof agate/VirtualList - * @extends ui/VirtualList.VirtualListBasic + * @extends ui/VirtualList.VirtualListBase * @ui * @public */ @@ -519,7 +519,7 @@ let VirtualGridList = ({role, ...rest}) => {
- + {isVerticalScrollbarVisible ? : null}
diff --git a/VirtualList/useThemeVirtualList.js b/VirtualList/useThemeVirtualList.js index fd8ba22bb..9d21d3ac7 100644 --- a/VirtualList/useThemeVirtualList.js +++ b/VirtualList/useThemeVirtualList.js @@ -34,7 +34,7 @@ const useSpottable = (props, instances) => { isWrappedBy5way: false, lastFocusedIndex: null, nodeIndexToBeFocused: false, - pause: new Pause('VirtualListBasic') + pause: new Pause('VirtualListBase') }); const {pause} = mutableRef.current; diff --git a/samples/sampler/stories/default/VirtualList.js b/samples/sampler/stories/default/VirtualList.js index 7031f01c0..37df16ee9 100644 --- a/samples/sampler/stories/default/VirtualList.js +++ b/samples/sampler/stories/default/VirtualList.js @@ -4,7 +4,7 @@ import {mergeComponentMetadata} from '@enact/storybook-utils'; import React from 'react'; import ri from '@enact/ui/resolution'; import {storiesOf} from '@storybook/react'; -import {VirtualListBasic as UiVirtualListBasic} from '@enact/ui/VirtualList'; +import {VirtualListBase as UiVirtualListBase} from '@enact/ui/VirtualList'; import Item from '@enact/agate/Item'; import VirtualList from '@enact/agate/VirtualList'; @@ -52,7 +52,7 @@ const updateDataSize = (dataSize) => { updateDataSize(defaultDataSize); -const VirtualListConfig = mergeComponentMetadata('VirtualList', UiVirtualListBasic, VirtualList); +const VirtualListConfig = mergeComponentMetadata('VirtualList', UiVirtualListBase, VirtualList); storiesOf('Agate', module) .add( @@ -80,7 +80,7 @@ storiesOf('Agate', module) }, { info: { - text: 'Basic usage of VirtualList' + text: 'The basic usage of VirtualList' } } );