diff --git a/src/core/main/custom/toolbar.ts b/src/core/main/custom/toolbar.ts index b539a40..cfb09c8 100644 --- a/src/core/main/custom/toolbar.ts +++ b/src/core/main/custom/toolbar.ts @@ -54,7 +54,7 @@ interface MiscInfo { id: string; name: string; emit: MiscEmitFn; - display: Component; + display: () => Component; activable?: boolean; actived?: ActivedFn; } @@ -75,7 +75,7 @@ interface Misc { id: string, name: string, emit: MiscEmitFn, - display: Component + display: () => Component ): void; /** diff --git a/src/core/main/init/toolbar.tsx b/src/core/main/init/toolbar.tsx index a87eee2..40bf42a 100644 --- a/src/core/main/init/toolbar.tsx +++ b/src/core/main/init/toolbar.tsx @@ -292,7 +292,7 @@ function MiscTool(props: CustomToolbarProps<'misc'>) { style={style} onClick={() => info.emit(v, toolbar, item)} > - {info.display} + {info.display()} ); })} @@ -759,10 +759,7 @@ Mota.require('var', 'hook').once('reset', () => { MotaSettingItem >; - CustomToolbar.misc.register( - 'danmaku', - '发弹幕', - openDanmakuPoster, + CustomToolbar.misc.register('danmaku', '发弹幕', openDanmakuPoster, () => h(MessageOutlined) ); CustomToolbar.misc.register( @@ -771,13 +768,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.useItem('book', true); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'fly', @@ -785,13 +784,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.useItem('fly', true); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'toolbox', @@ -799,13 +800,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { mainUi.open('toolbox'); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'equipbox', @@ -813,13 +816,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { mainUi.open('equipbox'); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'virtualKey', @@ -834,13 +839,15 @@ Mota.require('var', 'hook').once('reset', () => { ); }); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'shop', @@ -848,13 +855,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.openQuickShop(true); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'save', @@ -862,13 +871,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.save(true); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'load', @@ -876,13 +887,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.load(true); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'undo', @@ -890,7 +903,7 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.doSL('autoSave', 'load'); }, - h(RollbackOutlined) + () => h(RollbackOutlined) ); CustomToolbar.misc.register( 'redo', @@ -898,7 +911,7 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.doSL('autoSave', 'reload'); }, - h(RetweetOutlined) + () => h(RetweetOutlined) ); CustomToolbar.misc.register( 'setting', @@ -906,13 +919,15 @@ Mota.require('var', 'hook').once('reset', () => { () => { core.openSettings(true); }, - + () => ( + + ) ); CustomToolbar.misc.register( 'minimap', @@ -956,7 +971,7 @@ Mota.require('var', 'hook').once('reset', () => { } tool.refresh(); }, - h(LayoutOutlined) + () => h(LayoutOutlined) ); CustomToolbar.misc.bindActivable('minimap', true, () => minimapTool);