Skip to content

Commit

Permalink
Update branch, chagned b-virtual-scroll -> b-virtual-scroll-new
Browse files Browse the repository at this point in the history
  • Loading branch information
bonkalol committed Feb 7, 2024
1 parent d965334 commit 47d7162
Show file tree
Hide file tree
Showing 64 changed files with 4,168 additions and 3,678 deletions.
4 changes: 3 additions & 1 deletion components-lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hash": "3ae069d52d1989b96e528e8e9288454145d1b772025f020f37e2e2148bfea48d",
"hash": "098211bcc31aa8c403e2f0f126046ef09ad2fb212477edeb5a60735ae3e661f0",
"data": {
"%data": "%data:Map",
"%data:Map": [
Expand Down Expand Up @@ -2263,6 +2263,7 @@
"b-tree",
"b-window",
"b-virtual-scroll",
"b-virtual-scroll-new",
"b-bottom-slide",
"b-slider",
"b-sidebar",
Expand Down Expand Up @@ -2305,6 +2306,7 @@
"b-tree",
"b-window",
"b-virtual-scroll",
"b-virtual-scroll-new",
"b-bottom-slide",
"b-slider",
"b-sidebar",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import type { Locator, Page } from 'playwright';

import { ComponentObject, Scroll } from 'tests/helpers';

import type bVirtualScroll from 'components/base/b-virtual-scroll/b-virtual-scroll';
import type { ComponentRefs, VirtualScrollState } from 'components/base/b-virtual-scroll/interface';
import type { SlotsStateObj } from 'components/base/b-virtual-scroll/modules/slots';
import type bVirtualScrollNew from 'components/base/b-virtual-scroll-new/b-virtual-scroll-new';
import type { ComponentRefs, VirtualScrollState } from 'components/base/b-virtual-scroll-new/interface';
import type { SlotsStateObj } from 'components/base/b-virtual-scroll-new/modules/slots';

import { testStyles } from 'components/base/b-virtual-scroll/test/api/component-object/styles';
import { testStyles } from 'components/base/b-virtual-scroll-new/test/api/component-object/styles';

/**
* The component object API for testing the {@link bVirtualScroll} component.
* The component object API for testing the {@link bVirtualScrollNew} component.
*/
export class VirtualScrollComponentObject extends ComponentObject<bVirtualScroll['unsafe']> {
export class VirtualScrollComponentObject extends ComponentObject<bVirtualScrollNew['unsafe']> {
/**
* The locator for the container ref.
*/
Expand All @@ -38,7 +38,7 @@ export class VirtualScrollComponentObject extends ComponentObject<bVirtualScroll
* @param page - the Playwright page instance.
*/
constructor(page: Page) {
super(page, 'b-virtual-scroll');
super(page, 'b-virtual-scroll-new');

this.container = this.node.locator(this.elSelector('container'));
this.childList = this.container.locator('> *');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const testStyles = `
content: attr(data-index);
}
.b-virtual-scroll__container {
.b-virtual-scroll-new__container {
min-width: 20px;
min-height: 20px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ import type { Page } from 'playwright';

import test from 'tests/config/unit/test';

import { createInitialState as createInitialStateObj } from 'components/base/b-virtual-scroll/modules/state/helpers';
import type { MountedChild, ComponentItem, VirtualScrollState, MountedItem } from 'components/base/b-virtual-scroll/interface';
import { componentEvents, componentObserverLocalEvents } from 'components/base/b-virtual-scroll/const';
import { createInitialState as createInitialStateObj } from 'components/base/b-virtual-scroll-new/modules/state/helpers';
import type { MountedChild, ComponentItem, VirtualScrollState, MountedItem } from 'components/base/b-virtual-scroll-new/interface';
import { componentEvents, componentObserverLocalEvents } from 'components/base/b-virtual-scroll-new/const';

import { paginationHandler } from 'tests/helpers/providers/pagination';
import { RequestInterceptor } from 'tests/helpers/providers/interceptor';

import { VirtualScrollComponentObject } from 'components/base/b-virtual-scroll/test/api/component-object';
import type { DataConveyor, DataItemCtor, MountedItemCtor, StateApi, VirtualScrollTestHelpers, MountedSeparatorCtor, IndexedObj } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import { VirtualScrollComponentObject } from 'components/base/b-virtual-scroll-new/test/api/component-object';
import type { DataConveyor, DataItemCtor, MountedItemCtor, StateApi, VirtualScrollTestHelpers, MountedSeparatorCtor, IndexedObj } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

export * from 'components/base/b-virtual-scroll/test/api/component-object';
export * from 'components/base/b-virtual-scroll-new/test/api/component-object';

/**
* Creates a helper API for convenient testing of the `b-virtual-scroll` component
* Creates a helper API for convenient testing of the `b-virtual-scroll-new` component
* @param page - the page object representing the testing page.
*/
export async function createTestHelpers(page: Page): Promise<VirtualScrollTestHelpers> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* https://github.com/V4Fire/Client/blob/master/LICENSE
*/

import type { ComponentItem, VirtualScrollState, MountedChild, MountedItem } from 'components/base/b-virtual-scroll/interface';
import type { ComponentItem, VirtualScrollState, MountedChild, MountedItem } from 'components/base/b-virtual-scroll-new/interface';

import type { SpyObject } from 'tests/helpers/mock/interface';
import type { RequestInterceptor } from 'tests/helpers/providers/interceptor';
import type { VirtualScrollComponentObject } from 'components/base/b-virtual-scroll/test/api/component-object';
import type { VirtualScrollComponentObject } from 'components/base/b-virtual-scroll-new/test/api/component-object';

/**
* The interface defining the data conveyor for convenient data manipulation.
Expand Down Expand Up @@ -136,7 +136,7 @@ export interface StateApi {
*/
export interface VirtualScrollTestHelpers {
/**
* The component object representing the `bVirtualScroll` component.
* The component object representing the `bVirtualScrollNew` component.
*/
component: VirtualScrollComponentObject;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

import test from 'tests/config/unit/test';

import { createTestHelpers, filterEmitterCalls } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import { createTestHelpers, filterEmitterCalls } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import test from 'tests/config/unit/test';

import { fromQueryString } from 'core/url';

import type bVirtualScroll from 'components/base/b-virtual-scroll/b-virtual-scroll';
import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import type bVirtualScrollNew from 'components/base/b-virtual-scroll-new/b-virtual-scroll-new';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand All @@ -44,7 +44,7 @@ test.describe('<b-virtual-scroll>', () => {
.withDefaultPaginationProviderProps({chunkSize})
.withProps({
chunkSize,
'@hook:beforeDataCreate': (ctx: bVirtualScroll['unsafe']) => jestMock.spy(ctx.componentFactory, 'produceComponentItems')
'@hook:beforeDataCreate': (ctx: bVirtualScrollNew['unsafe']) => jestMock.spy(ctx.componentFactory, 'produceComponentItems')
})
.build({useDummy: true});

Expand Down Expand Up @@ -76,7 +76,7 @@ test.describe('<b-virtual-scroll>', () => {
chunkSize,
requestQuery: () => ({get: {param1: 'param1'}}),
shouldPerformDataRequest: () => false,
'@hook:beforeDataCreate': (ctx: bVirtualScroll['unsafe']) => jestMock.spy(ctx.componentFactory, 'produceComponentItems')
'@hook:beforeDataCreate': (ctx: bVirtualScrollNew['unsafe']) => jestMock.spy(ctx.componentFactory, 'produceComponentItems')
})
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import test from 'tests/config/unit/test';

import { Scroll } from 'tests/helpers';

import type { VirtualScrollState, ShouldPerform } from 'components/base/b-virtual-scroll/interface';
import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import type bVirtualScroll from 'components/base/b-virtual-scroll/b-virtual-scroll';
import type { VirtualScrollState, ShouldPerform } from 'components/base/b-virtual-scroll-new/interface';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';
import type bVirtualScrollNew from 'components/base/b-virtual-scroll-new/b-virtual-scroll-new';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand Down Expand Up @@ -146,7 +146,7 @@ test.describe('<b-virtual-scroll>', () => {
shouldPerformDataRender,
shouldStopRequestingData: () => true,
chunkSize,
'@hook:beforeDataCreate': (ctx: bVirtualScroll) => jestMock.spy(ctx.unsafe.componentFactory, 'produceNodes')
'@hook:beforeDataCreate': (ctx: bVirtualScrollNew) => jestMock.spy(ctx.unsafe.componentFactory, 'produceNodes')
});

await component.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

import test from 'tests/config/unit/test';

import type { ComponentItemFactory, ComponentItem, ShouldPerform, VirtualScrollState } from 'components/base/b-virtual-scroll/interface';
import type { ComponentItemFactory, ComponentItem, ShouldPerform, VirtualScrollState } from 'components/base/b-virtual-scroll-new/interface';

import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll> rendering via itemsFactory', () => {
test.describe('<b-virtual-scroll-new> rendering via itemsFactory', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

import test from 'tests/config/unit/test';

import type { ShouldPerform } from 'components/base/b-virtual-scroll/interface';
import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import type { ShouldPerform } from 'components/base/b-virtual-scroll-new/interface';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

import test from 'tests/config/unit/test';

import type bVirtualScroll from 'components/base/b-virtual-scroll/b-virtual-scroll';
import { defaultShouldProps } from 'components/base/b-virtual-scroll/const';
import type { ComponentItem, ShouldPerform } from 'components/base/b-virtual-scroll/interface';
import type bVirtualScrollNew from 'components/base/b-virtual-scroll-new/b-virtual-scroll-new';
import { defaultShouldProps } from 'components/base/b-virtual-scroll-new/const';
import type { ComponentItem, ShouldPerform } from 'components/base/b-virtual-scroll-new/interface';

import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand All @@ -35,7 +35,7 @@ test.describe('<b-virtual-scroll>', () => {
test('Initial state', async () => {
const
chunkSize = 12,
mockFn = await component.mockFn((ctx: bVirtualScroll) => ctx.getVirtualScrollState());
mockFn = await component.mockFn((ctx: bVirtualScrollNew) => ctx.getVirtualScrollState());

provider.response(200, {data: []}, {delay: (10).seconds()});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

import test from 'tests/config/unit/test';

import { createTestHelpers, filterEmitterResults } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import type { VirtualScrollState } from 'components/base/b-virtual-scroll/interface';
import { createTestHelpers, filterEmitterResults } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';
import type { VirtualScrollState } from 'components/base/b-virtual-scroll-new/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@

import test from 'tests/config/unit/test';

import type bVirtualScroll from 'components/base/b-virtual-scroll/b-virtual-scroll';
import { defaultShouldProps } from 'components/base/b-virtual-scroll/const';
import type bVirtualScrollNew from 'components/base/b-virtual-scroll-new/b-virtual-scroll-new';
import { defaultShouldProps } from 'components/base/b-virtual-scroll-new/const';

import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
initLoadSpy: VirtualScrollTestHelpers['initLoadSpy'],
provider: VirtualScrollTestHelpers['provider'],
state: VirtualScrollTestHelpers['state'];

const hookProp = {
'@hook:beforeDataCreate': (ctx: bVirtualScroll['unsafe']) => {
'@hook:beforeDataCreate': (ctx: bVirtualScrollNew['unsafe']) => {
const
original = ctx.componentInternalState.compile.bind(ctx.componentInternalState);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import test from 'tests/config/unit/test';

import { BOM } from 'tests/helpers';

import type { ShouldPerform } from 'components/base/b-virtual-scroll/b-virtual-scroll';
import type { SlotsStateObj } from 'components/base/b-virtual-scroll/modules/slots';
import type { ShouldPerform } from 'components/base/b-virtual-scroll-new/b-virtual-scroll-new';
import type { SlotsStateObj } from 'components/base/b-virtual-scroll-new/modules/slots';

import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';

// eslint-disable-next-line max-lines-per-function
test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: Awaited<ReturnType<typeof createTestHelpers>>['component'],
provider: Awaited<ReturnType<typeof createTestHelpers>>['provider'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

import test from 'tests/config/unit/test';

import { createTestHelpers, filterEmitterResults } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import type { ComponentItem, VirtualScrollState } from 'components/base/b-virtual-scroll/interface';
import { createTestHelpers, filterEmitterResults } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';
import type { ComponentItem, VirtualScrollState } from 'components/base/b-virtual-scroll-new/interface';

const j = (...str: string[]) => str.join(', ');

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import test from 'tests/config/unit/test';

import type { ComponentElement } from 'core/component';

import type bVirtualScroll from 'components/base/b-virtual-scroll/b-virtual-scroll';
import { createTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import type bVirtualScrollNew from 'components/base/b-virtual-scroll-new/b-virtual-scroll-new';
import { createTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand All @@ -36,15 +36,15 @@ test.describe('<b-virtual-scroll>', () => {
type: 'div',
attrs: {
id: 'renderNext',
'@click': () => (<ComponentElement<bVirtualScroll>>document.querySelector('.b-virtual-scroll')).component?.initLoadNext()
'@click': () => (<ComponentElement<bVirtualScrollNew>>document.querySelector('.b-virtual-scroll-new')).component?.initLoadNext()
}
},

retry: {
type: 'div',
attrs: {
id: 'retry',
'@click': () => (<ComponentElement<bVirtualScroll>>document.querySelector('.b-virtual-scroll')).component?.initLoadNext()
'@click': () => (<ComponentElement<bVirtualScrollNew>>document.querySelector('.b-virtual-scroll-new')).component?.initLoadNext()
}
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

import test from 'tests/config/unit/test';

import { createTestHelpers, filterEmitterCalls } from 'components/base/b-virtual-scroll/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll/test/api/helpers/interface';
import { createTestHelpers, filterEmitterCalls } from 'components/base/b-virtual-scroll-new/test/api/helpers';
import type { VirtualScrollTestHelpers } from 'components/base/b-virtual-scroll-new/test/api/helpers/interface';

test.describe('<b-virtual-scroll>', () => {
test.describe('<b-virtual-scroll-new>', () => {
let
component: VirtualScrollTestHelpers['component'],
provider: VirtualScrollTestHelpers['provider'],
Expand Down
Loading

0 comments on commit 47d7162

Please sign in to comment.