[2.0.17] 확장블록 변경된 로직 적용

.eslintrc

@@ -15,7 +15,9 @@
     "browser": true
   },
   "globals": {
-    "Entry": true
+    "Entry": true,
+    "Lang": true,
+    "entrylms": true,
   },
   "rules": {
     "no-console": "off",

src/renderer/helper/entry/entryModalHelper.ts

@@ -403,24 +403,49 @@ class EntryModalHelper {
      * 확장블록 리스트를 가져와, 확장블록 추가 팝업을 노출한다.
      */
     static async showExpansionPopup() {
-        let expansionBlocks = _.uniq(_.values(Entry.EXPANSION_BLOCK_LIST));
-        expansionBlocks = _.sortBy(expansionBlocks, function(item) {
+        const expansionBlocks = this._getActiveExpansionBlocks();
+
+        await this._switchPopup('expansion', {
+            submit: (data: any) => {
+                this._addExpansionBlocks(data.selected);
+            },
+            itemoff: ({ data, callback }: { data: any; callback?: () => void }) => {
+                const isActive = Entry.expansion.isActive(data.name);
+                if (!isActive) {
+                    callback && callback();
+                } else {
+                    entrylms.alert(Lang.Workspace.deselect_expansion_block_warning);
+                }
+            },
+            itemon: ({ callback }: { callback?: () => void }) => {
+                callback && callback();
+            },
+        }, expansionBlocks as any);
+    }
+
+    static _getActiveExpansionBlocks() {
+        const activated = Entry.expansionBlocks;
+        const expansionBlocks = _.uniq(_.values(Entry.EXPANSION_BLOCK_LIST)).map((item) => {
+            item.active = activated.includes(item.name);
+            return item;
+        });
+        return _.sortBy(expansionBlocks, (item) => {
             let result = '';
             if (item.title) {
-                item.nameByLang = item.title[RendererUtils.getLangType() || 'ko'];
+                item.nameByLang = item.title[Lang.type];
                 result = item.title.ko.toLowerCase();
             }
             return result;
         });
+    }
 
-        await this._switchPopup('expansion', {
-            submit: (data: any) => {
-                Entry.playground.addExpansionBlocks(data.selected);
-            },
-            select: (data: any) => {
-                Entry.playground.addExpansionBlocks(data.item);
-            },
-        }, expansionBlocks as any);
+    static _addExpansionBlocks(blocks: any) {
+        const addBlocks = blocks.filter(({ name }: { name: string }) => !Entry.expansionBlocks.includes(name));
+        const removeBlocks = this._getActiveExpansionBlocks()
+            .filter((item) => item.active)
+            .filter((item) => !blocks.includes(item));
+        Entry.playground.addExpansionBlocks(addBlocks);
+        Entry.playground.removeExpansionBlocks(removeBlocks);
     }
 
     /**

types/index.d.ts

@@ -10,7 +10,7 @@ declare type Point = {
     y: number;
 };
 
-declare namespace NodeJS  {
+declare namespace NodeJS {
     // noinspection JSUnusedGlobalSymbols
     interface Global {
         sharedObject: GlobalConfigurations;
@@ -21,8 +21,11 @@ declare namespace NodeJS  {
 declare interface Window {
     createjs: any;
     EntryStatic: any;
+    Lang: any;
 }
 
+declare var entrylms: any;
+declare var Lang: any;
 declare var createjs: any;
 declare var EntryStatic: any;
 
@@ -126,7 +129,8 @@ declare module IEntry {
      * 하드웨어가 연결되면 필요여부에 따라 프로퍼티패널에 하드웨어 모니터가 노출됨
      */
     export interface HardwareMonitor {
-        new (hwModule: HardwareModule): HardwareMonitor;
+        new(hwModule: HardwareModule): HardwareMonitor;
+
         initView: () => void;
         generateView: () => void;
         generateListView: () => void;
@@ -138,6 +142,7 @@ declare module IEntry {
     enum WorkspaceMode {
         MODE_BOARD, MODE_VIMBOARD, MODE_OVERLAYBOARD
     }
+
     export type Project = {
         name: string;
         script: any & {
@@ -184,6 +189,7 @@ declare module IEntry {
 
     export interface Container {
         getAllObjects(): any[];
+
         addObject: (objectModel: any, ...rest: number[]) => any;
         getObject: (objectId: string) => IEntry.Object;
         cachePicture: (pictureId: string, image: any) => void;
@@ -212,6 +218,7 @@ declare module IEntry {
         downloadSound: (soundId: string) => void;
         changeViewMode: (viewType: PlaygroundViewMode) => void;
         addExpansionBlocks: (expansionInfoList: any[]) => void;
+        removeExpansionBlocks: (expansionInfoList: any[]) => void;
         painter: Painter;
         setMenu?: (...args: any[]) => any;
         board: any;
@@ -313,6 +320,7 @@ declare class Entry {
     static stage: IEntry.Stage;
     static toast: IEntry.ToastLegacy;
     static Func: any;
+    static expansionBlocks: any[];
 
     // 엔트리 네임스페이스에 할당되어있는 특정 함수들
     static generateHash: () => string;