Copy config to clipboard
diff --git a/spec/__snapshots__/snippingTool.spec.tsx.snap b/spec/__snapshots__/snippingTool.spec.tsx.snap
index a2d33c167..a8477eef2 100644
--- a/spec/__snapshots__/snippingTool.spec.tsx.snap
+++ b/spec/__snapshots__/snippingTool.spec.tsx.snap
@@ -21,7 +21,7 @@ exports[`Snipping Tool should render correctly 1`] = `
title="Pen"
>
diff --git a/src/renderer/components/snipping-tool.tsx b/src/renderer/components/snipping-tool.tsx
index 090a50373..2b1fabf68 100644
--- a/src/renderer/components/snipping-tool.tsx
+++ b/src/renderer/components/snipping-tool.tsx
@@ -3,6 +3,9 @@ import * as React from 'react';
import { svgAsPngUri } from 'save-svg-as-png';
import { i18n } from '../../common/i18n-preload';
import { ScreenShotAnnotation } from '../../common/ipcEvent';
+import * as PenIcon from '../../renderer/assets/snip-draw.svg';
+import * as EraseIcon from '../../renderer/assets/snip-erase.svg';
+import * as HighlightIcon from '../../renderer/assets/snip-highlight.svg';
import {
AnalyticsElements,
ScreenSnippetActionTypes,
@@ -10,7 +13,6 @@ import {
import AnnotateArea from './annotate-area';
import ColorPickerPill, { IColor } from './color-picker-pill';
import MenuButton from './menu-button';
-
const { useState, useRef, useEffect, useLayoutEffect } = React;
export enum Tool {
@@ -90,9 +92,8 @@ const SnippingTool: React.FunctionComponent
+
diff --git a/src/renderer/preload-component.ts b/src/renderer/preload-component.ts
index 2c73b2382..0e5d6f153 100644
--- a/src/renderer/preload-component.ts
+++ b/src/renderer/preload-component.ts
@@ -24,17 +24,9 @@ const enum components {
notificationSettings = 'notification-settings',
welcome = 'welcome',
snippingTool = 'snipping-tool',
- titleBar = 'title-bar',
+ titleBar = 'windows-title-bar',
}
-const loadStyle = (style) => {
- const styles = document.createElement('link');
- styles.rel = 'stylesheet';
- styles.type = 'text/css';
- styles.href = `./styles/${style}.css`;
- document.getElementsByTagName('head')[0].appendChild(styles);
-};
-
/**
* Loads the appropriate component
*/
@@ -46,36 +38,29 @@ const load = () => {
let component;
switch (componentName) {
case components.aboutApp:
- loadStyle(components.aboutApp);
component = AboutBox;
document.title = i18n.t('About Symphony', 'AboutSymphony')();
break;
case components.screenPicker:
- loadStyle(components.screenPicker);
document.title = i18n.t('Screen Picker - Symphony')();
component = ScreenPicker;
break;
case components.screenSharingIndicator:
- loadStyle(components.screenSharingIndicator);
document.title = i18n.t('Screen Sharing Indicator - Symphony')();
component = ScreenSharingIndicator;
break;
case components.screenSharingFrame:
- loadStyle(components.screenSharingFrame);
component = ScreenSharingFrame;
break;
case components.snippingTool:
- loadStyle(components.snippingTool);
document.title = i18n.t('Symphony')();
component = SnippingTool;
break;
case components.basicAuth:
- loadStyle(components.basicAuth);
document.title = i18n.t('Basic Authentication - Symphony')();
component = BasicAuth;
break;
case components.notification:
- loadStyle(components.notification);
document.title = i18n.t('Notification - Symphony')();
component = NotificationComp;
break;
@@ -84,19 +69,16 @@ const load = () => {
'Notification Settings - Symphony',
'NotificationSettings',
)();
- loadStyle(components.notificationSettings);
component = NotificationSettings;
break;
case components.welcome:
document.title = i18n.t('WelcomeText', 'Welcome')();
- loadStyle(components.welcome);
component = Welcome;
break;
case components.titleBar:
if (title) {
document.title = title;
}
- loadStyle(components.titleBar);
component = WindowsTitleBar;
break;
}
diff --git a/src/renderer/react-window.html b/src/renderer/react-window.html
index b5f55c11f..426764a6d 100644
--- a/src/renderer/react-window.html
+++ b/src/renderer/react-window.html
@@ -17,7 +17,9 @@
+
+
diff --git a/src/renderer/styles/title-bar.less b/src/renderer/styles/windows-title-bar.less
similarity index 100%
rename from src/renderer/styles/title-bar.less
rename to src/renderer/styles/windows-title-bar.less
diff --git a/svgTransform.js b/svgTransform.js
new file mode 100644
index 000000000..a8255e5d5
--- /dev/null
+++ b/svgTransform.js
@@ -0,0 +1,10 @@
+module.exports = {
+ process() {
+ return {
+ code: `module.exports = {};`,
+ };
+ },
+ getCacheKey() {
+ return 'svgTransform';
+ },
+};
diff --git a/tsconfig.json b/tsconfig.json
index 8b0a3d4bd..54df5a7af 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -25,5 +25,8 @@
"typeRoots": ["node_modules/@types"]
},
"include": ["src/**/*"],
- "exclude": ["node_modules", "lib", "tests", "spec"]
+ "exclude": ["node_modules", "lib", "tests", "spec"],
+ "exports": {
+ "src/renderer/components/about-app": "./lib/about-app/index.js"
+ }
}