Update tsconfig and refactor (niuware#207)

* Set noUnusedLocals in tsconfig * Remove unused type * Refactor setupStyleMap function * Refactor setupBlockMap function * Refactor blockRenderer function * Remove unused parameter from styleRenderer function * Bump package version
tomduval · Nov 5, 2020 · 573cf34 · 573cf34
1 parent acf3eb9
commit 573cf34
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mui-rte",
-  "version": "1.26.0",
+  "version": "1.26.1",
   "description": "Material-UI Rich Text Editor and Viewer",
   "keywords": [
     "material-ui",

diff --git a/src/MUIRichTextEditor.tsx b/src/MUIRichTextEditor.tsx
@@ -111,11 +111,6 @@ type TPosition = {
     left: number
 }
 
-type TCustomRenderers = {
-    style?: DraftStyleMap
-    block?: Immutable.Map<any, any>
-}
-
 const styles = ({ spacing, typography, palette }: Theme) => createStyles({
     root: {
     },
@@ -889,13 +884,10 @@ const MUIRichTextEditor: RefForwardingComponent<TMUIRichTextEditorRef, IMUIRichT
 
     const setupStyleMap = () => {
         const customStyleMap = JSON.parse(JSON.stringify(styleRenderMap))
-        if (props.customControls) {
-            props.customControls.forEach(control => {
-                if (control.type === "inline" && control.inlineStyle) {
-                    customStyleMap[control.name.toUpperCase()] = control.inlineStyle
-                }
+        props.customControls?.filter(control => control.type === "inline" && control.inlineStyle)
+            .forEach(control => {
+                customStyleMap[control.name.toUpperCase()] = control.inlineStyle
             })
-        }
         customStyleMapRef.current = customStyleMap
     }
 
@@ -908,16 +900,13 @@ const MUIRichTextEditor: RefForwardingComponent<TMUIRichTextEditorRef, IMUIRichT
 
     const setupBlockMap = () => {
         const customBlockMap: any = {}
-        if (props.customControls) {
-            props.customControls.forEach(control => {
-                if (control.type === "block" && control.blockWrapper) {
-                    customBlockMap[control.name.toUpperCase()] = {
-                        element: "div",
-                        wrapper: control.blockWrapper
-                    }
+        props.customControls?.filter(control => control.type === "block" && control.blockWrapper)
+            .forEach(control => {
+                customBlockMap[control.name.toUpperCase()] = {
+                    element: "div",
+                    wrapper: control.blockWrapper
                 }
             })
-        }
         customBlockMapRef.current = DefaultDraftBlockRenderMap.merge(blockRenderMap, Immutable.Map(customBlockMap))
     }
 
@@ -940,21 +929,20 @@ const MUIRichTextEditor: RefForwardingComponent<TMUIRichTextEditorRef, IMUIRichT
                     }
                 } else {
                     const block = atomicBlockExists(type.toLowerCase(), props.customControls)
-                    if (!block) {
-                        return null
-                    }
-                    return {
-                        component: block.atomicComponent,
-                        editable: false,
-                        props: contentState.getEntity(contentBlock.getEntityAt(0)).getData()
+                    if (block) {
+                        return {
+                            component: block.atomicComponent,
+                            editable: false,
+                            props: contentState.getEntity(contentBlock.getEntityAt(0)).getData()
+                        }
                     }
                 }
             }
         }
         return null
     }
 
-    const styleRenderer = (style: any, _block: ContentBlock): React.CSSProperties => {
+    const styleRenderer = (style: any): React.CSSProperties => {
         const customStyleMap = getStyleMap()
         const styleNames = style.toJS()
         return styleNames.reduce((styles: any, styleName: string) => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,6 +8,7 @@
         "esModuleInterop": true,
         "noImplicitReturns": true,
         "noUnusedParameters": true,
+        "noUnusedLocals": true,
         "outDir": "dist",
         "baseUrl": ".",
         "jsx": "react",