Merge pull request #32 from CodeDead/release/2.1.0

Release/2.1.0

Author: CodeDead

.eslintignore

@@ -4,3 +4,4 @@ node_modules
 build
 src/serviceWorker.js
 README.md
+.eslintcache

.gitignore

@@ -33,3 +33,5 @@ dist/*
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
+
+.eslintcache

.yarn/releases/yarn-2.3.3.cjs

@@ -2,6 +2,6 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/yarn-up-all-plugin.cjs
-    spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.0.2/index.js"
+    spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.0.3/index.js"
 
-yarnPath: .yarn/releases/yarn-2.3.3.cjs
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

.yarn/releases/yarn-2.4.0.cjs

@@ -1,12 +1,13 @@
-![DeadHash](https://codedead.com/wp-content/uploads/2020/06/DeadHash.png)
+![DeadHash](https://i.imgur.com/PWrqQ67.png)
 
 # DeadHash
 
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/CodeDead/DeadHash-js)
 ![GitHub](https://img.shields.io/github/license/CodeDead/DeadHash-Js)
-![GitHub Releases (by Release)](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/2.0.4/total)
+![GitHub Releases (by Release)](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/2.1.0/total)
 
 DeadHash is a free and open-source utility to calculate file and text hashes. The following hash calculations are supported:
+
 * MD4
 * MD5
 * SHA-1

.yarnrc.yml

@@ -1,6 +1,6 @@
 {
   "name": "deadhash",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "File and text hash calculator",
   "homepage": "./",
   "private": true,
@@ -12,7 +12,7 @@
   "build": {
     "appId": "com.codedead.deadhash",
     "productName": "DeadHash",
-    "copyright": "Copyright © 2020 ${author}",
+    "copyright": "Copyright © 2021 ${author}",
     "win": {
       "target": [
         "nsis",
@@ -35,16 +35,16 @@
   },
   "main": "public/electron.js",
   "dependencies": {
-    "@material-ui/core": "^4.11.0",
-    "@material-ui/icons": "^4.9.1",
-    "cross-env": "^7.0.2",
+    "@material-ui/core": "^4.11.3",
+    "@material-ui/icons": "^4.11.2",
+    "cross-env": "^7.0.3",
     "electron-is-dev": "^1.2.0",
     "react": "^17.0.1",
-    "react-contexify": "^4.1.1",
+    "react-contexify": "^5.0.0",
     "react-dom": "^17.0.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^4.0.0"
+    "react-scripts": "^4.0.1"
   },
   "scripts": {
     "react-start": "react-scripts start",
@@ -70,13 +70,13 @@
   },
   "devDependencies": {
     "concurrently": "^5.3.0",
-    "electron": "^10.1.5",
+    "electron": "^11.2.1",
     "electron-builder": "^22.9.1",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "wait-on": "^5.2.0"
+    "wait-on": "^5.2.1"
   }
 }

README.md

@@ -15,6 +15,7 @@ const createWindow = () => {
   mainWindow = new BrowserWindow({
     webPreferences: {
       nodeIntegration: true,
+      contextIsolation: false,
     },
     frame: false,
     title: 'DeadHash',
@@ -26,13 +27,13 @@ const createWindow = () => {
   fileWorkerWindow = new BrowserWindow({
     show: isDev,
     icon: path.join(__dirname, '../build/logo512.png'),
-    webPreferences: { nodeIntegration: true },
+    webPreferences: { nodeIntegration: true, contextIsolation: false },
   });
 
   textWorkerWindow = new BrowserWindow({
     show: isDev,
     icon: path.join(__dirname, '../build/logo512.png'),
-    webPreferences: { nodeIntegration: true },
+    webPreferences: { nodeIntegration: true, contextIsolation: false },
   });
 
   if (isDev) {

package.json

@@ -26,20 +26,14 @@ const App = () => {
   const [, dispatch] = useContext(CryptoContext);
 
   const enabled = state.canDragDrop;
-  let { themeIndex } = state;
-
-  let themeType = 'light';
-  if (themeIndex === 8) {
-    themeType = 'dark';
-    themeIndex = 2;
-  }
+  const { themeIndex, themeStyle } = state;
 
   const color = ThemeSelector(themeIndex);
 
   const theme = createMuiTheme({
     palette: {
       primary: color,
-      type: themeType,
+      type: themeStyle,
     },
   });
 

public/electron.js

@@ -1,28 +1,52 @@
 import React from 'react';
-import { Item, Menu, MenuProvider } from 'react-contexify';
+import { Item, Menu, useContextMenu } from 'react-contexify';
 import CopyIcon from '@material-ui/icons/FileCopy';
 import PasteIcon from '@material-ui/icons/Assignment';
 
 const CopyPasteMenu = ({
   id, children, copyData, pasteData, copy, paste,
-}) => (
-  <>
-    <MenuProvider id={`copyPasteMenu${id}`} style={{ width: '100%' }}>
-      {children}
-    </MenuProvider>
-    <Menu id={`copyPasteMenu${id}`}>
-      <Item onClick={() => copyData()}>
-        <CopyIcon />
-        {' '}
-        {copy}
-      </Item>
-      <Item onClick={() => pasteData()}>
-        <PasteIcon />
-        {' '}
-        {paste}
-      </Item>
-    </Menu>
-  </>
-);
+}) => {
+  const MENU_ID = `copyPasteMenu${id}`;
+
+  const { show } = useContextMenu({
+    id: MENU_ID,
+  });
+
+  /**
+   * Handle the context menu event
+   * @param event The event argument
+   */
+  const handleContextMenu = (event) => {
+    event.preventDefault();
+    show(event, {
+      props: {
+        key: 'value',
+      },
+    });
+  };
+
+  return (
+    <>
+      <div
+        style={{ width: '100%' }}
+        onContextMenu={handleContextMenu}
+      >
+        {children}
+      </div>
+      <Menu id={MENU_ID}>
+        <Item onClick={() => copyData()}>
+          <CopyIcon />
+          {' '}
+          {copy}
+        </Item>
+        <Item onClick={() => pasteData()}>
+          <PasteIcon />
+          {' '}
+          {paste}
+        </Item>
+      </Menu>
+    </>
+  );
+};
 
 export default CopyPasteMenu;