Merge branch 'dev'

Author: ChugunovRoman

src/main/events/ipcMain.ts

@@ -203,7 +203,7 @@ export const registerIpcMainHandlers = () => {
     const lastDir = storage.get().app.lastExportDir || storage.get().app.exportDir;
 
     if (files.length === 1 && !files[0].name.includes(path.sep)) {
-      const originalFileName = files[0].name;
+      const originalFileName = files[0].name.replace(/\//g, "-");
       const savePath = await dialogs.showSaveDialog({
         defaultPath: `${lastDir}/${path.basename(originalFileName)}`,
         showsTagField: false,
@@ -239,7 +239,7 @@ export const registerIpcMainHandlers = () => {
     directoryPath = path.resolve(directoryPath);
     let filesToBeReplaced = 0;
     for (const file of files) {
-      const outputPath = path.join(directoryPath, file.name);
+      const outputPath = path.join(directoryPath, file.name.replace(/\//g, "-"));
       const validExtensions = [".fig", ".jpg", ".pdf", ".png", ".svg"];
       if (
         path.relative(directoryPath, outputPath).startsWith("..") ||
@@ -277,7 +277,7 @@ export const registerIpcMainHandlers = () => {
       }
     }
     for (const file of files) {
-      const outputPath = path.join(directoryPath, file.name);
+      const outputPath = path.join(directoryPath, file.name.replace(/\//g, "-"));
       mkPath(path.dirname(outputPath));
 
       try {

src/main/window/WindowManager.ts

@@ -68,6 +68,7 @@ class WindowManager {
       width: 1200,
       height: 900,
       frame: false,
+      resizable: true,
       webPreferences: {
         sandbox: false,
         zoomFactor: 1,

src/renderer/components/TopPanel/toppanel.tsx

@@ -23,10 +23,10 @@ const TopPanel: React.FunctionComponent<TopPanelProps> = props => {
     <div className="top-panel" style={{ zoom: props.scalePanel ? props.scalePanel : 1 }}>
       <div className="panelButtons">
         <Button
-          className={`button_clear button_title button_main${!props.current ? " tab_active tab_main_active" : ""}`}
+          className={`button_clear button_title button_main${!props.current ? " tab_active" : ""}`}
           onClick={props.onMainTab}
         >
-          <Icon color="currentColor" type="Figma" size="17" />
+          <Icon color="currentColor" type="Home" size="18" />
         </Button>
         {props.visibleNewProjectBtn ? (
           <Button className="button_clear button_title" onClick={props.onNewProject}>

src/renderer/elements/Icon/icons/Home.tsx

@@ -0,0 +1,15 @@
+import * as React from "react";
+
+import { IconProps } from "..";
+import "../index.scss";
+
+export const Home: React.FunctionComponent<IconProps> = props => {
+  const size = props.size ? props.size : "16";
+  const color = props.color ? props.color : "#000";
+
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path d="M2 9.2L8 2L14 9.2V14H9.71429V10.4H6.28571V14H2V9.2Z" fill={color} />
+    </svg>
+  );
+};

src/renderer/elements/Icon/index.tsx

@@ -21,6 +21,7 @@ import { Sync } from "./icons/Sync";
 import { Figma } from "./icons/Figma";
 import { Restore } from "./icons/Restore";
 import { CloseTab } from "./icons/CloseTab";
+import { Home } from "./icons/Home";
 import "../../animations.scss";
 import "./index.scss";
 
@@ -45,6 +46,7 @@ type Icons =
   | "Settings"
   | "Figma"
   | "Restore"
+  | "Home"
   | "CloseTab";
 
 export interface IconProps {
@@ -81,6 +83,7 @@ export class Icon extends React.Component<ContainerProps, unknown> {
     Figma,
     Restore,
     CloseTab,
+    Home,
   };
 
   constructor(props: ContainerProps) {
@@ -90,7 +93,6 @@ export class Icon extends React.Component<ContainerProps, unknown> {
   render(): JSX.Element {
     const classNames: string[] = ["icon"];
     const IconView = this.iconsMap[this.props.type];
-    const size = this.props.size || "16";
 
     if (this.props.className) {
       classNames.push(this.props.className);
@@ -101,7 +103,7 @@ export class Icon extends React.Component<ContainerProps, unknown> {
 
     return (
       <div className={classNames.join(" ")}>
-        <IconView color={this.props.color} size={size} />
+        <IconView {...this.props} />
       </div>
     );
   }