From 86c036505b91bc9d28b869822afe7d507545d7c1 Mon Sep 17 00:00:00 2001 From: Lipis Date: Thu, 24 Dec 2020 23:05:22 +0200 Subject: [PATCH] chore: Remove unused cursorX, cursorY from AppState (#2665) --- src/appState.ts | 4 - src/components/LayerUI.tsx | 2 - .../regressionTests.test.tsx.snap | 134 ------------------ src/types.ts | 2 - 4 files changed, 142 deletions(-) diff --git a/src/appState.ts b/src/appState.ts index b4dc998c..7b8eba03 100644 --- a/src/appState.ts +++ b/src/appState.ts @@ -44,8 +44,6 @@ export const getDefaultAppState = (): Omit< viewBackgroundColor: oc.white, scrollX: 0 as FlooredNumber, scrollY: 0 as FlooredNumber, - cursorX: 0, - cursorY: 0, cursorButton: "up", scrolledOutside: false, name: `${t("labels.untitled")}-${getDateTime()}`, @@ -108,8 +106,6 @@ const APP_STATE_STORAGE_CONF = (< currentItemStartArrowhead: { browser: true, export: false }, currentItemEndArrowhead: { browser: true, export: false }, cursorButton: { browser: true, export: false }, - cursorX: { browser: true, export: false }, - cursorY: { browser: true, export: false }, draggingElement: { browser: false, export: false }, editingElement: { browser: false, export: false }, startBoundElement: { browser: false, export: false }, diff --git a/src/components/LayerUI.tsx b/src/components/LayerUI.tsx index 6e4ebbeb..767b3e8f 100644 --- a/src/components/LayerUI.tsx +++ b/src/components/LayerUI.tsx @@ -641,8 +641,6 @@ const LayerUI = ({ const areEqual = (prev: LayerUIProps, next: LayerUIProps) => { const getNecessaryObj = (appState: AppState): Partial => { const { - cursorX, - cursorY, suggestedBindings, startBoundElement: boundElement, ...ret diff --git a/src/tests/__snapshots__/regressionTests.test.tsx.snap b/src/tests/__snapshots__/regressionTests.test.tsx.snap index 8ffa26a5..f9cee43f 100644 --- a/src/tests/__snapshots__/regressionTests.test.tsx.snap +++ b/src/tests/__snapshots__/regressionTests.test.tsx.snap @@ -19,8 +19,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -474,8 +472,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -935,8 +931,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": "id10", @@ -1705,8 +1699,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -1903,8 +1895,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -2355,8 +2345,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -2602,8 +2590,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -2760,8 +2746,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -3231,8 +3215,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -3533,8 +3515,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -3731,8 +3711,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -3969,8 +3947,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -4215,8 +4191,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -4570,8 +4544,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": Object { "angle": 0, "backgroundColor": "transparent", @@ -4859,8 +4831,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": Object { "angle": 0, "backgroundColor": "transparent", @@ -5160,8 +5130,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": Object { "angle": 0, "backgroundColor": "transparent", @@ -5362,8 +5330,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": Object { "angle": 0, "backgroundColor": "transparent", @@ -5542,8 +5508,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": "id3", @@ -5989,8 +5953,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -6301,8 +6263,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -8329,8 +8289,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -8685,8 +8643,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -8934,8 +8890,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -9181,8 +9135,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -9490,8 +9442,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -9648,8 +9598,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -9806,8 +9754,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -9964,8 +9910,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -10152,8 +10096,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -10340,8 +10282,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -10528,8 +10468,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -10716,8 +10654,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -10874,8 +10810,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -11032,8 +10966,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -11220,8 +11152,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -11378,8 +11308,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -11566,8 +11494,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -12276,8 +12202,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -12523,8 +12447,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -12619,8 +12541,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -12713,8 +12633,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -12871,8 +12789,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -13173,8 +13089,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -13475,8 +13389,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -13633,8 +13545,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -13823,8 +13733,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -14066,8 +13974,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -14384,8 +14290,6 @@ Object { "currentItemStrokeWidth": 2, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -15217,8 +15121,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -15519,8 +15421,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -15821,8 +15721,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -16194,8 +16092,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -16355,8 +16251,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -16670,8 +16564,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -16903,8 +16795,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -17152,8 +17042,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -17473,8 +17361,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -17567,8 +17453,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -17725,8 +17609,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -18540,8 +18422,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -18634,8 +18514,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": "id3", @@ -19358,8 +19236,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": Object { "angle": 0, "backgroundColor": "transparent", @@ -19757,8 +19633,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": Object { "angle": 0, "backgroundColor": "transparent", @@ -20046,8 +19920,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "down", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -20142,8 +20014,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -20634,8 +20504,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, @@ -20728,8 +20596,6 @@ Object { "currentItemStrokeWidth": 1, "currentItemTextAlign": "left", "cursorButton": "up", - "cursorX": 0, - "cursorY": 0, "draggingElement": null, "editingElement": null, "editingGroupId": null, diff --git a/src/types.ts b/src/types.ts index 9c99376c..6161bf88 100644 --- a/src/types.ts +++ b/src/types.ts @@ -67,8 +67,6 @@ export type AppState = { viewBackgroundColor: string; scrollX: FlooredNumber; scrollY: FlooredNumber; - cursorX: number; - cursorY: number; cursorButton: "up" | "down"; scrolledOutside: boolean; name: string;