Skip to content

Rename ScrollerBasic, VirtualListBasic as ScrollerBase, VirtualListBase from agate #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ybsung wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Rename ScrollerBasic, VirtualListBasic as ScrollerBase, VirtualListBase from agate #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Scroller/Scroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -41,7 +41,7 @@ const nop = () => {};
*
* @class Scroller
* @memberof agate/Scroller
* @extends ui/Scroller.ScrollerBasic
* @extends ui/Scroller.ScrollerBase
* @ui
* @public
*/
Expand Down Expand Up @@ -72,7 +72,7 @@ let Scroller = (props) => {
<div {...scrollContainerProps}>
<div {...scrollInnerContainerProps}>
<ScrollContentWrapper {...scrollContentWrapperProps}>
<UiScrollerBasic {...themeScrollContentProps} ref={scrollContentHandle} />
<UiScrollerBase {...themeScrollContentProps} ref={scrollContentHandle} />
</ScrollContentWrapper>
{isVerticalScrollbarVisible ? <Scrollbar {...verticalScrollbarProps} /> : null}
</div>
Expand Down
10 changes: 5 additions & 5 deletions VirtualList/VirtualList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -27,7 +27,7 @@ const nop = () => {};
*
* @class VirtualList
* @memberof agate/VirtualList
* @extends ui/VirtualList.VirtualListBasic
* @extends ui/VirtualList.VirtualListBase
* @ui
* @public
*/
Expand Down Expand Up @@ -76,7 +76,7 @@ let VirtualList = ({itemSize, role, ...rest}) => {
<div {...scrollContainerProps}>
<div {...scrollInnerContainerProps}>
<ScrollContentWrapper {...scrollContentWrapperProps}>
<UiVirtualListBasic {...themeScrollContentProps} ref={scrollContentHandle} />
<UiVirtualListBase {...themeScrollContentProps} ref={scrollContentHandle} />
</ScrollContentWrapper>
{isVerticalScrollbarVisible ? <Scrollbar {...verticalScrollbarProps} /> : null}
</div>
Expand Down Expand Up @@ -486,7 +486,7 @@ VirtualList.defaultProps = {
*
* @class VirtualGridList
* @memberof agate/VirtualList
* @extends ui/VirtualList.VirtualListBasic
* @extends ui/VirtualList.VirtualListBase
* @ui
* @public
*/
Expand Down Expand Up @@ -519,7 +519,7 @@ let VirtualGridList = ({role, ...rest}) => {
<div {...scrollContainerProps}>
<div {...scrollInnerContainerProps}>
<ScrollContentWrapper {...scrollContentWrapperProps}>
<UiVirtualListBasic {...themeScrollContentProps} ref={scrollContentHandle} />
<UiVirtualListBase {...themeScrollContentProps} ref={scrollContentHandle} />
</ScrollContentWrapper>
{isVerticalScrollbarVisible ? <Scrollbar {...verticalScrollbarProps} /> : null}
</div>
Expand Down
2 changes: 1 addition & 1 deletion VirtualList/useThemeVirtualList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions samples/sampler/stories/default/VirtualList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -80,7 +80,7 @@ storiesOf('Agate', module)
},
{
info: {
text: 'Basic usage of VirtualList'
text: 'The basic usage of VirtualList'
}
}
);