Merge a673dfa into 0ef60af

cocopon · Feb 25, 2023 · 3876c21 · 3876c21
2 parents 0ef60af + a673dfa
commit 3876c21
Show file tree

Hide file tree

Showing 34 changed files with 256 additions and 325 deletions.
diff --git a/packages/core/lib/sass/view/_views.scss b/packages/core/lib/sass/view/_views.scss
@@ -16,7 +16,6 @@
 @forward './point-2d-picker';
 @forward './point-nd-text';
 @forward './popup';
-@forward './separator';
 @forward './slider';
 @forward './tab';
 @forward './text';

diff --git a/packages/core/src/blade/common/api/container-test.ts b/packages/core/src/blade/common/api/container-test.ts
@@ -3,10 +3,21 @@ import {it} from 'mocha';
 
 import {ContainerApi} from './container';
 
+function addSomeBladeApi(api: ContainerApi, opt_index?: number) {
+	return api.addBlade({
+		index: opt_index,
+		view: 'test',
+	});
+}
+
 export function testBladeContainer(createApi: () => ContainerApi) {
 	it('should implement children', () => {
 		const api = createApi();
-		const bapis = [api.addSeparator(), api.addSeparator(), api.addSeparator()];
+		const bapis = [
+			addSomeBladeApi(api),
+			addSomeBladeApi(api),
+			addSomeBladeApi(api),
+		];
 		api.add(bapis[0]);
 		api.add(bapis[1]);
 		api.add(bapis[2]);
@@ -33,15 +44,6 @@ export function testBladeContainer(createApi: () => ContainerApi) {
 		assert.strictEqual(api.children[0], bapi2);
 	});
 
-	it('should implement addSeparator()', () => {
-		const api = createApi();
-		const bapi1 = api.addSeparator();
-		assert.strictEqual(api.children[api.children.length - 1], bapi1);
-
-		const bapi2 = api.addSeparator({index: 0});
-		assert.strictEqual(api.children[0], bapi2);
-	});
-
 	it('should implement addTab()', () => {
 		const api = createApi();
 		const bapi1 = api.addTab({pages: [{title: 'foo'}]});
@@ -85,28 +87,23 @@ export function testBladeContainer(createApi: () => ContainerApi) {
 
 	it('should implement addBlade()', () => {
 		const api = createApi();
-		const bapi1 = api.addBlade({
-			view: 'separator',
-		});
+		const bapi1 = addSomeBladeApi(api);
 		assert.strictEqual(api.children[api.children.length - 1], bapi1);
 
-		const bapi2 = api.addBlade({
-			index: 0,
-			view: 'separator',
-		});
+		const bapi2 = addSomeBladeApi(api, 0);
 		assert.strictEqual(api.children[0], bapi2);
 	});
 
 	it('should implement remove()', () => {
 		const api = createApi();
-		const bapi = api.addSeparator();
+		const bapi = addSomeBladeApi(api);
 		api.remove(bapi);
 		assert.notStrictEqual(api.children[api.children.length - 1], bapi);
 	});
 
 	it('should implement add()', () => {
 		const api = createApi();
-		const bapi = api.addSeparator();
+		const bapi = addSomeBladeApi(api);
 		api.remove(bapi);
 
 		api.add(bapi);
@@ -119,8 +116,8 @@ export function testBladeContainer(createApi: () => ContainerApi) {
 
 	it('should move to the last when re-adding child', () => {
 		const api = createApi();
-		const bapi = api.addSeparator();
-		api.addSeparator();
+		const bapi = addSomeBladeApi(api);
+		addSomeBladeApi(api);
 		api.add(bapi);
 
 		assert.strictEqual(api.children.length, 2);
@@ -130,7 +127,7 @@ export function testBladeContainer(createApi: () => ContainerApi) {
 
 	it('should be removed from previous parent', () => {
 		const api1 = createApi();
-		const bapi = api1.addSeparator();
+		const bapi = addSomeBladeApi(api1);
 		api1.add(bapi);
 		const api2 = createApi();
 		api2.add(bapi);

diff --git a/packages/core/src/blade/common/api/container.ts b/packages/core/src/blade/common/api/container.ts
@@ -3,16 +3,9 @@ import {BaseBladeParams} from '../../../common/params';
 import {BindingApi} from '../../binding/api/binding';
 import {ButtonApi} from '../../button/api/button';
 import {FolderApi} from '../../folder/api/folder';
-import {SeparatorApi} from '../../separator/api/separator';
 import {TabApi} from '../../tab/api/tab';
 import {BladeApi} from './blade';
-import {
-	BindingParams,
-	ButtonParams,
-	FolderParams,
-	SeparatorParams,
-	TabParams,
-} from './params';
+import {BindingParams, ButtonParams, FolderParams, TabParams} from './params';
 
 export interface ContainerApi {
 	/**
@@ -22,7 +15,6 @@ export interface ContainerApi {
 
 	addButton(params: ButtonParams): ButtonApi;
 	addFolder(params: FolderParams): FolderApi;
-	addSeparator(opt_params?: SeparatorParams): SeparatorApi;
 	addTab(params: TabParams): TabApi;
 	add(api: BladeApi, opt_index?: number): void;
 	remove(api: BladeApi): void;
@@ -67,17 +59,6 @@ export function addFolderAsBlade(
 	}) as FolderApi;
 }
 
-export function addSeparatorAsBlade(
-	api: ContainerApi,
-	opt_params?: SeparatorParams,
-): SeparatorApi {
-	const params = opt_params ?? {};
-	return api.addBlade({
-		...params,
-		view: 'separator',
-	});
-}
-
 export function addTabAsBlade(api: ContainerApi, params: TabParams): TabApi {
 	return api.addBlade({
 		...params,

diff --git a/packages/core/src/blade/common/api/params.ts b/packages/core/src/blade/common/api/params.ts
@@ -36,8 +36,6 @@ export interface FolderParams extends BaseParams {
 	expanded?: boolean;
 }
 
-export type SeparatorParams = BaseParams;
-
 export interface TabParams extends BaseParams {
 	pages: {
 		title: string;

diff --git a/packages/core/src/blade/common/api/rack.ts b/packages/core/src/blade/common/api/rack.ts
@@ -7,7 +7,6 @@ import {PluginPool} from '../../../plugin/pool';
 import {BindingApi} from '../../binding/api/binding';
 import {ButtonApi} from '../../button/api/button';
 import {FolderApi} from '../../folder/api/folder';
-import {SeparatorApi} from '../../separator/api/separator';
 import {TabApi} from '../../tab/api/tab';
 import {BladeController} from '../controller/blade';
 import {RackController} from '../controller/rack';
@@ -17,18 +16,11 @@ import {BladeApi} from './blade';
 import {
 	addButtonAsBlade,
 	addFolderAsBlade,
-	addSeparatorAsBlade,
 	addTabAsBlade,
 	ContainerApi,
 } from './container';
 import {isContainerBladeApi} from './container-blade';
-import {
-	BindingParams,
-	ButtonParams,
-	FolderParams,
-	SeparatorParams,
-	TabParams,
-} from './params';
+import {BindingParams, ButtonParams, FolderParams, TabParams} from './params';
 import {TpChangeEvent} from './tp-event';
 
 /**
@@ -122,10 +114,6 @@ export class RackApi implements ContainerApi {
 		return addButtonAsBlade(this, params);
 	}
 
-	public addSeparator(opt_params?: SeparatorParams): SeparatorApi {
-		return addSeparatorAsBlade(this, opt_params);
-	}
-
 	public addTab(params: TabParams): TabApi {
 		return addTabAsBlade(this, params);
 	}

diff --git a/packages/core/src/blade/folder/api/folder-test.ts b/packages/core/src/blade/folder/api/folder-test.ts
@@ -11,6 +11,7 @@ import {testBladeContainer} from '../../common/api/container-test';
 import {assertUpdates} from '../../common/api/test-util';
 import {TpChangeEvent, TpFoldEvent} from '../../common/api/tp-event';
 import {createBlade} from '../../common/model/blade';
+import {TestValueBladePlugin} from '../../test-util';
 import {FolderController} from '../controller/folder';
 import {FolderPropsObject} from '../view/folder';
 import {FolderApi} from './folder';
@@ -25,6 +26,7 @@ function createApi(opt_doc?: Document): FolderApi {
 		viewProps: ViewProps.create(),
 	});
 	const pool = createDefaultPluginPool();
+	pool.register(TestValueBladePlugin);
 	return new FolderApi(c, pool);
 }
 
@@ -67,16 +69,6 @@ describe(FolderApi.name, () => {
 		assert.strictEqual(api['controller_'].foldable.get('expanded'), false);
 	});
 
-	it('should dispose separator', () => {
-		const api = createApi();
-		const cs = api['controller_'].rackController.rack.children;
-
-		const s = api.addSeparator();
-		assert.strictEqual(cs.length, 1);
-		s.dispose();
-		assert.strictEqual(cs.length, 0);
-	});
-
 	it('should add folder', () => {
 		const pane = createApi();
 		const f = pane.addFolder({

diff --git a/packages/core/src/blade/folder/api/folder.ts b/packages/core/src/blade/folder/api/folder.ts
@@ -12,11 +12,9 @@ import {
 	BindingParams,
 	ButtonParams,
 	FolderParams,
-	SeparatorParams,
 	TabParams,
 } from '../../common/api/params';
 import {TpChangeEvent, TpFoldEvent} from '../../common/api/tp-event';
-import {SeparatorApi} from '../../separator/api/separator';
 import {TabApi} from '../../tab/api/tab';
 import {FolderController} from '../controller/folder';
 
@@ -86,10 +84,6 @@ export class FolderApi
 		return this.rackApi_.addButton(params);
 	}
 
-	public addSeparator(opt_params?: SeparatorParams): SeparatorApi {
-		return this.rackApi_.addSeparator(opt_params);
-	}
-
 	public addTab(params: TabParams): TabApi {
 		return this.rackApi_.addTab(params);
 	}

diff --git a/packages/core/src/blade/separator/api/separator.ts b/packages/core/src/blade/separator/api/separator.ts
diff --git a/packages/core/src/blade/tab/api/tab-page-test.ts b/packages/core/src/blade/tab/api/tab-page-test.ts
@@ -7,6 +7,7 @@ import {createTestWindow} from '../../../misc/dom-test-util';
 import {createDefaultPluginPool} from '../../../plugin/plugins';
 import {testBladeContainer} from '../../common/api/container-test';
 import {createBlade} from '../../common/model/blade';
+import {TestValueBladePlugin} from '../../test-util';
 import {TabPageController, TabPagePropsObject} from '../controller/tab-page';
 import {TabItemPropsObject} from '../view/tab-item';
 import {TabPageApi} from './tab-page';
@@ -25,6 +26,7 @@ function createApi() {
 		viewProps: ViewProps.create(),
 	});
 	const pool = createDefaultPluginPool();
+	pool.register(TestValueBladePlugin);
 	return new TabPageApi(c, pool);
 }
 

diff --git a/packages/core/src/blade/tab/api/tab-page.ts b/packages/core/src/blade/tab/api/tab-page.ts
@@ -9,11 +9,9 @@ import {
 	BindingParams,
 	ButtonParams,
 	FolderParams,
-	SeparatorParams,
 	TabParams,
 } from '../../common/api/params';
 import {FolderApi} from '../../folder/api/folder';
-import {SeparatorApi} from '../../separator/api/separator';
 import {TabPageController} from '../controller/tab-page';
 import {TabApi} from './tab';
 
@@ -49,10 +47,6 @@ export class TabPageApi
 		return this.rackApi_.addFolder(params);
 	}
 
-	public addSeparator(opt_params?: SeparatorParams): SeparatorApi {
-		return this.rackApi_.addSeparator(opt_params);
-	}
-
 	public addTab(params: TabParams): TabApi {
 		return this.rackApi_.addTab(params);
 	}

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -38,10 +38,6 @@ export * from './blade/label/controller/label';
 export * from './blade/label/controller/value-label';
 export * from './blade/label/view/label';
 
-export * from './blade/separator/api/separator';
-export * from './blade/separator/controller/separator';
-export * from './blade/separator/plugin';
-
 export * from './blade/tab/api/tab';
 export * from './blade/tab/api/tab-page';
 export * from './blade/tab/controller/tab';

diff --git a/packages/core/src/plugin/plugins.ts b/packages/core/src/plugin/plugins.ts
@@ -1,7 +1,6 @@
 import {ButtonBladePlugin} from '../blade/button/plugin';
 import {FolderBladePlugin} from '../blade/folder/plugin';
 import {BladePlugin} from '../blade/plugin';
-import {SeparatorBladePlugin} from '../blade/separator/plugin';
 import {TabBladePlugin} from '../blade/tab/plugin';
 import {BooleanInputPlugin} from '../input-binding/boolean/plugin';
 import {NumberColorInputPlugin} from '../input-binding/color/plugin-number';
@@ -52,7 +51,6 @@ export function createDefaultPluginPool(): PluginPool {
 		// Blade
 		ButtonBladePlugin,
 		FolderBladePlugin,
-		SeparatorBladePlugin,
 		TabBladePlugin,
 	].forEach((p) => {
 		pool.register(p);

diff --git a/packages/tweakpane/src/doc/template/blades/index.html b/packages/tweakpane/src/doc/template/blades/index.html
@@ -88,4 +88,25 @@ <h2 id="slider">Slider</h2>
 		</div>
 	</div>
 </div>
+
+
+<h2 id="separator">Separator</h2>
+<p>
+	<a href="{{ root }}api/interfaces/SeparatorBladeParams.html">Parameters</a> | <a href="{{ root }}api/classes/SeparatorBladeApi.html">API</a>
+</p>
+<div class="main_media">
+	<div class="demo">
+		<div class="demo_code">
+			<div class="codeBlock"><pre><code class="js">const pane = new Pane();
+// ...
+pane.addBlade({
+  view: 'separator',
+});
+// ...</code></pre></div>
+		</div>
+		<div class="demo_result">
+			<div class="paneContainer" data-pane-separator></div>
+		</div>
+	</div>
+</div>
 {% endblock %}
diff --git a/packages/tweakpane/src/doc/template/partial/_global-nav.html b/packages/tweakpane/src/doc/template/partial/_global-nav.html
@@ -68,9 +68,6 @@
 				<li class="submenuItem">
 					<a class="submenuItem_anchor" href="{{ root }}ui-components/#tab">Tab</a>
 				</li>
-				<li class="submenuItem">
-					<a class="submenuItem_anchor" href="{{ root }}ui-components/#separator">Separator</a>
-				</li>
 			</ul>
 		</li>
 		<li class="menuItem">
@@ -87,6 +84,9 @@
 				<li class="submenuItem">
 					<a class="submenuItem_anchor" href="{{ root }}blades/#slider">Slider</a>
 				</li>
+				<li class="submenuItem">
+					<a class="submenuItem_anchor" href="{{ root }}blades/#separator">Separator</a>
+				</li>
 			</ul>
 		</li>
 		<li class="menuItem">

diff --git a/packages/tweakpane/src/doc/template/ui-components/index.html b/packages/tweakpane/src/doc/template/ui-components/index.html
@@ -117,23 +117,4 @@ <h2 id="tab">Tab</h2>
 		</div>
 	</div>
 </div>
-
-
-<h2 id="separator">Separator</h2>
-<p><code>addSeparator()</code> is for adding a separator between components.</p>
-
-<div class="main_media">
-	<div class="demo">
-		<div class="demo_code">
-			<div class="codeBlock"><pre><code class="js">const pane = new Pane();
-pane.addButton({title: 'Previous'});
-pane.addButton({title: 'Next'});
-pane<strong>.addSeparator</strong>();
-pane.addButton({title: 'Reset'});</code></pre></div>
-		</div>
-		<div class="demo_result">
-			<div class="paneContainer" data-pane-separator></div>
-		</div>
-	</div>
-</div>
 {% endblock %}