Merge branch 'figma#52'

Figma-Linux · Aug 22, 2019 · d2d94da · d2d94da
2 parents b20413c + 5147ab6
commit d2d94da
Show file tree

Hide file tree

Showing 65 changed files with 3,347 additions and 858 deletions.
diff --git a/@types/common/index.d.ts → @types/Common/index.d.ts b/@types/common/index.d.ts → @types/Common/index.d.ts
diff --git a/@types/Common/menu.d.ts b/@types/Common/menu.d.ts
@@ -0,0 +1,72 @@
+declare namespace Menu {
+    /**
+     * Import Electron types
+     */
+    type _MenuItemConstructorOptions = import('electron').MenuItemConstructorOptions;
+    type _MenuItem = import('electron').MenuItem;
+    type _BrowserWindow = import('electron').BrowserWindow;
+
+    /**
+     * Public types
+     */
+    type NativeClick = (item: _MenuItem, window: _BrowserWindow, event: Event) => void;
+    type CutsomClick = (item: _MenuItemConstructorOptions, window: _BrowserWindow, event: Event) => void;
+
+    type Params = ParamsId | ParamsAction | ParamsCommand;
+    type MenuItem = Items.MenuName & Items.PluginItem & Items.Separator & Items.Submenu & Items.Menu & Items.StringKey;
+
+    type MenuAction =  {
+        type: string;
+    };
+
+    type PluginMenuItem = PluginMenuItemOptions & _MenuItemConstructorOptions;
+
+    namespace Items {
+        interface MenuName {
+            type: string;
+            key: string;
+            string: string;
+            plugin: string;
+        }
+
+        interface Separator {
+            type: 'separator';
+        }
+        interface Submenu {
+            type: 'submenu'
+            name: string;
+            submenu: [MenuName & Separator & Submenu & Menu & PluginItem & StringKey];
+        }
+        interface Menu {
+            disabled?: boolean;
+			type: 'run-menu-action';
+			menuAction: MenuAction;
+			name: MenuName
+        }
+        interface PluginItem {
+            type: 'plugin-name';
+            plugin: string;
+        }
+        interface StringKey {
+            type: 'string-key';
+            string: string;
+        }
+    }
+
+    interface PluginMenuItemOptions {
+        pluginMenuAction?: MenuAction;
+    }
+
+    interface ParamsId {
+        id: string;
+        click?: NativeClick | CutsomClick
+    }
+    interface ParamsAction {
+        action: string;
+        click?: NativeClick | CutsomClick
+    }
+    interface ParamsCommand {
+        command: string;
+        click?: NativeClick | CutsomClick
+    }
+}
diff --git a/@types/Main/extension.d.ts b/@types/Main/extension.d.ts
@@ -0,0 +1,8 @@
+declare namespace Extensions {
+    interface Extension {
+        id: number;
+        path: string;
+        lastKnownName: string;
+        manifestPath: string;
+    }
+}
diff --git a/@types/Main/index.d.ts b/@types/Main/index.d.ts
@@ -0,0 +1,10 @@
+declare namespace MenuState {
+    interface State {
+        [name: string]: boolean;
+    }
+
+    interface MenuStateParams {
+        actionState?: State;
+        pluginMenuData?: Menu.MenuItem[];
+    }
+}
diff --git a/@types/Main/request.d.ts b/@types/Main/request.d.ts
@@ -0,0 +1,6 @@
+declare namespace Request {
+    interface Responce {
+        url: string;
+        data: string;
+    }
+}
diff --git a/@types/Main/resources.d.ts b/@types/Main/resources.d.ts
@@ -0,0 +1,12 @@
+declare namespace Resources {
+    interface File {
+        name: string;
+        data: Promise<string | void>;
+    }
+
+    interface Page {
+        url: string;
+        data: string;
+        links: string[];
+    }
+}
diff --git a/@types/renderer/index.d.ts → @types/Renderer/index.d.ts b/@types/renderer/index.d.ts → @types/Renderer/index.d.ts
@@ -6,6 +6,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
         fileBrowser: boolean;
 
         postMessage(name: string, args?: any, transferList?: Transferable[]): void;
+        registerCallback(name: string, args: any, callback: Function): void;
         promiseMessage(name: string, args?: any, transferList?: Transferable[]): Promise<void>
         setMessageHandler(handler: Function): void;
     };

diff --git a/@types/renderer/stores.d.ts → @types/Renderer/stores.d.ts b/@types/renderer/stores.d.ts → @types/Renderer/stores.d.ts
diff --git a/@types/Renderer/webApi.d.ts b/@types/Renderer/webApi.d.ts
@@ -0,0 +1,5 @@
+declare namespace WepApi {
+	interface SetPluginMenuDataProps {
+		data: Menu.MenuItem[];
+	}
+}
diff --git a/@types/common/menu.d.ts b/@types/common/menu.d.ts
diff --git a/@types/fonts.d.ts b/@types/fonts.d.ts
diff --git a/@types/index.d.ts b/@types/index.d.ts
@@ -8,51 +8,79 @@ declare namespace Electron {
 	}
 
 	interface App extends EventEmitter {
-		on(event: 'updateActionState', listener: (state: Object) => void): this;
-		once(event: 'updateActionState', listener: (state: Object) => void): this;
-		addListener(event: 'updateActionState', listener: (state: Object) => void): this;
-		removeListener(event: 'updateActionState', listener: (state: Object) => void): this;
-
-		on(event: 'handleCommand', listener: (command: string) => void): this;
-		once(event: 'handleCommand', listener: (command: string) => void): this;
-		addListener(event: 'handleCommand', listener: (command: string) => void): this;
-		removeListener(event: 'handleCommand', listener: (command: string) => void): this;
-
-		on(event: 'updateFigmaUiScale', listener: (scale: number) => void): this;
-		once(event: 'updateFigmaUiScale', listener: (scale: number) => void): this;
-		addListener(event: 'updateFigmaUiScale', listener: (scale: number) => void): this;
-		removeListener(event: 'updateFigmaUiScale', listener: (scale: number) => void): this;
-
-		on(event: 'updatePanelScale', listener: (scale: number) => void): this;
-		once(event: 'updatePanelScale', listener: (scale: number) => void): this;
-		addListener(event: 'updatePanelScale', listener: (scale: number) => void): this;
-		removeListener(event: 'updatePanelScale', listener: (scale: number) => void): this;
-
-		on(event: 'setHideMainMenu', listener: (hide: boolean) => void): this;
-		once(event: 'setHideMainMenu', listener: (hide: boolean) => void): this;
-		addListener(event: 'setHideMainMenu', listener: (hide: boolean) => void): this;
-		removeListener(event: 'setHideMainMenu', listener: (hide: boolean) => void): this;
-
-		on(event: 'setDisableMainMenu', listener: (disabled: boolean) => void): this;
-		once(event: 'setDisableMainMenu', listener: (disabled: boolean) => void): this;
-		addListener(event: 'setDisableMainMenu', listener: (disabled: boolean) => void): this;
-		removeListener(event: 'setDisableMainMenu', listener: (disabled: boolean) => void): this;
-
-		on(event: 'setDisableFonts', listener: (disabled: boolean) => void): this;
-		once(event: 'setDisableFonts', listener: (disabled: boolean) => void): this;
-		addListener(event: 'setDisableFonts', listener: (disabled: boolean) => void): this;
-		removeListener(event: 'setDisableFonts', listener: (disabled: boolean) => void): this;
+		on(event: 'handle-command', listener: (command: string) => void): this;
+		once(event: 'handle-command', listener: (command: string) => void): this;
+		addListener(event: 'handle-command', listener: (command: string) => void): this;
+		removeListener(event: 'handle-command', listener: (command: string) => void): this;
+		emit(event: 'handle-command', command: string): boolean;
+
+		on(event: 'handle-page-command', listener: (item: any, window: BrowserWindow) => void): this;
+		once(event: 'handle-page-command', listener: (item: any, window: BrowserWindow) => void): this;
+		addListener(event: 'handle-page-command', listener: (item: any, window: BrowserWindow) => void): this;
+		removeListener(event: 'handle-page-command', listener: (item: any, window: BrowserWindow) => void): this;
+		emit(event: 'handle-page-command', item: any, window: BrowserWindow): boolean;
+
+		on(event: 'update-figma-ui-scale', listener: (scale: number) => void): this;
+		once(event: 'update-figma-ui-scale', listener: (scale: number) => void): this;
+		addListener(event: 'update-figma-ui-scale', listener: (scale: number) => void): this;
+		removeListener(event: 'update-figma-ui-scale', listener: (scale: number) => void): this;
+		emit(event: 'update-figma-ui-scale', scale: number): boolean;
+
+		on(event: 'update-panel-scale', listener: (scale: number) => void): this;
+		once(event: 'update-panel-scale', listener: (scale: number) => void): this;
+		addListener(event: 'update-panel-scale', listener: (scale: number) => void): this;
+		removeListener(event: 'update-panel-scale', listener: (scale: number) => void): this;
+		emit(event: 'update-panel-scale', scale: number): boolean;
+
+		on(event: 'set-hide-main-menu', listener: (hide: boolean) => void): this;
+		once(event: 'set-hide-main-menu', listener: (hide: boolean) => void): this;
+		addListener(event: 'set-hide-main-menu', listener: (hide: boolean) => void): this;
+		removeListener(event: 'set-hide-main-menu', listener: (hide: boolean) => void): this;
+		emit(event: 'set-hide-main-menu', hide: boolean): boolean;
+
+		on(event: 'set-disable-main-menu', listener: (disabled: boolean) => void): this;
+		once(event: 'set-disable-main-menu', listener: (disabled: boolean) => void): this;
+		addListener(event: 'set-disable-main-menu', listener: (disabled: boolean) => void): this;
+		removeListener(event: 'set-disable-main-menu', listener: (disabled: boolean) => void): this;
+		emit(event: 'set-disable-main-menu', disabled: boolean): boolean;
+
+		on(event: 'set-disable-fonts', listener: (disabled: boolean) => void): this;
+		once(event: 'set-disable-fonts', listener: (disabled: boolean) => void): this;
+		addListener(event: 'set-disable-fonts', listener: (disabled: boolean) => void): this;
+		removeListener(event: 'set-disable-fonts', listener: (disabled: boolean) => void): this;
+		emit(event: 'set-disable-fonts', disabled: boolean): boolean;
+
+		on(event: 'os-menu-invalidated', listener: (dependencies: MenuState.MenuStateParams) => void): this;
+		once(event: 'os-menu-invalidated', listener: (dependencies: MenuState.MenuStateParams) => void): this;
+		addListener(event: 'os-menu-invalidated', listener: (dependencies: MenuState.MenuStateParams) => void): this;
+		removeListener(event: 'os-menu-invalidated', listener: (dependencies: MenuState.MenuStateParams) => void): this;
+		emit(event: 'os-menu-invalidated', dependencies: MenuState.MenuStateParams): boolean;
+
+		on(event: 'log', listener: (data: any) => void): this;
+		once(event: 'log', listener: (data: any) => void): this;
+		addListener(event: 'log', listener: (data: any) => void): this;
+		removeListener(event: 'log', listener: (data: any) => void): this;
+		emit(event: 'log', data: any): boolean;
 	}
 
 	interface IpcMain extends EventEmitter {
-		on(channel: string, listener: Function): this;
-		once(channel: string, listener: Function): this;
+		on(channel: string, listener: (event: Event, args: any) => void): this;
+		once(channel: string, listener: (event: Event, args: any) => void): this;
 		removeAllListeners(channel: string): this;
-		removeListener(channel: string, listener: Function): this;
+		removeListener(channel: string, listener: (event: Event, args: any) => void): this;
 
-		on(channel: 'setTitle', listener: (event: Event, title: string, id: number) => void): this;
-		once(channel: 'setTitle', listener: (event: Event, title: string, id: number) => void): this;
+		on(channel: 'setTitle', listener: (event: Event, title: string) => void): this;
+		once(channel: 'setTitle', listener: (event: Event, title: string) => void): this;
 		removeAllListeners(channel: 'setTitle'): this;
-		removeListener(channel: 'setTitle', listener: (event: Event, title: string, id: number) => void): this;
+		removeListener(channel: 'setTitle', listener: (event: Event, title: string) => void): this;
+
+		on(channel: 'setPluginMenuData', listener: (event: Event, pluginMenu: Menu.MenuItem[]) => void): this;
+		once(channel: 'setPluginMenuData', listener: (event: Event, pluginMenu: Menu.MenuItem[]) => void): this;
+		removeAllListeners(channel: 'setPluginMenuData'): this;
+		removeListener(channel: 'setPluginMenuData', listener: (event: Event, pluginMenu: Menu.MenuItem[]) => void): this;
+	}
+
+	interface RequestHeaders {
+		[name: string]: string;
 	}
 }
diff --git a/config/webpack.config.main.js b/config/webpack.config.main.js
@@ -19,10 +19,11 @@ const main = {
         extensions: ['.ts', '.tsx', '.js', '.jsx', '.json', 'node'],
 
         alias: {
-            Components: path.resolve(rootFolder, 'src/renderer/components'),
+            // Components: path.resolve(rootFolder, 'src/renderer/components'),
             Middleware: path.resolve(rootFolder, 'src/middleware'),
-            Store: path.resolve(rootFolder, 'src/renderer/stores'),
+            // Store: path.resolve(rootFolder, 'src/renderer/stores'),
             Const: path.resolve(rootFolder, 'src/constants'),
+            Main: path.resolve(rootFolder, 'src/main'),
             Utils: path.resolve(rootFolder, 'src/utils')
         }
     },

diff --git a/config/webpack.config.renderer.js b/config/webpack.config.renderer.js
@@ -8,7 +8,7 @@ const render = {
     entry: {
         '../middleware/loadMainContetnt': path.resolve(rootFolder, 'src/middleware/loadMainContetnt.ts'),
         '../middleware/loadContetnt': path.resolve(rootFolder, 'src/middleware/loadContetnt.ts'),
-        '../middleware/webApi': path.resolve(rootFolder, 'src/middleware/webApi.ts')
+        // '../middleware/webApi': path.resolve(rootFolder, 'src/middleware/webApi.ts')
     },
 
     module: {
@@ -27,6 +27,7 @@ const render = {
             Middleware: path.resolve(rootFolder, 'src/middleware'),
             Store: path.resolve(rootFolder, 'src/renderer/stores'),
             Const: path.resolve(rootFolder, 'src/constants'),
+            Main: path.resolve(rootFolder, 'src/main'),
             Utils: path.resolve(rootFolder, 'src/utils')
         }
     },