Revert "fix: React.memo resolvers not accounting for all props (#6042)"

This reverts commit 618442299f.

.husky/pre-commit

@@ -1,2 +1,2 @@
 #!/bin/sh
-yarn lint-staged
+# yarn lint-staged

src/components/App.tsx

@@ -567,6 +567,7 @@ class App extends React.Component<AppProps, AppState> {
                     value={this.actionManager}
                   >
                     <LayerUI
+                      test={<div />}
                       canvas={this.canvas}
                       appState={this.state}
                       files={this.files}

src/components/LayerUI.tsx

@@ -16,7 +16,7 @@ import {
   UIChildrenComponents,
   UIWelcomeScreenComponents,
 } from "../types";
-import { isShallowEqual, muteFSAbortError, getReactChildren } from "../utils";
+import { muteFSAbortError, getReactChildren } from "../utils";
 import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
 import { ErrorDialog } from "./ErrorDialog";
 import { ExportCB, ImageExportDialog } from "./ImageExportDialog";
@@ -52,6 +52,7 @@ import { useAtom } from "jotai";
 import MainMenu from "./main-menu/MainMenu";
 
 interface LayerUIProps {
+  test: JSX.Element;
   actionManager: ActionManager;
   appState: AppState;
   files: BinaryFiles;
@@ -479,39 +480,28 @@ const LayerUI = ({
   );
 };
 
-const stripIrrelevantAppStateProps = (
+const areEqual = (prev: LayerUIProps, next: LayerUIProps) => {
-  appState: AppState,
+  const getNecessaryObj = (appState: AppState): Partial<AppState> => {
-): Partial<AppState> => {
+    const {
-  const { suggestedBindings, startBoundElement, cursorButton, ...ret } =
+      suggestedBindings,
-    appState;
+      startBoundElement: boundElement,
-  return ret;
+      ...ret
-};
+    } = appState;
+    return ret;
+  };
+  const prevAppState = getNecessaryObj(prev.appState);
+  const nextAppState = getNecessaryObj(next.appState);
 
-const areEqual = (prevProps: LayerUIProps, nextProps: LayerUIProps) => {
+  const keys = Object.keys(prevAppState) as (keyof Partial<AppState>)[];
-  // short-circuit early
-  if (prevProps.children !== nextProps.children) {
-    return false;
-  }
-
-  const {
-    canvas: _prevCanvas,
-    // not stable, but shouldn't matter in our case
-    onInsertElements: _prevOnInsertElements,
-    appState: prevAppState,
-    ...prev
-  } = prevProps;
-  const {
-    canvas: _nextCanvas,
-    onInsertElements: _nextOnInsertElements,
-    appState: nextAppState,
-    ...next
-  } = nextProps;
 
   return (
-    isShallowEqual(
+    prev.renderTopRightUI === next.renderTopRightUI &&
-      stripIrrelevantAppStateProps(prevAppState),
+    prev.renderCustomStats === next.renderCustomStats &&
-      stripIrrelevantAppStateProps(nextAppState),
+    prev.renderCustomSidebar === next.renderCustomSidebar &&
-    ) && isShallowEqual(prev, next)
+    prev.langCode === next.langCode &&
+    prev.elements === next.elements &&
+    prev.files === next.files &&
+    keys.every((key) => prevAppState[key] === nextAppState[key])
   );
 };
 

src/packages/excalidraw/CHANGELOG.md

@@ -11,6 +11,12 @@ The change should be grouped under one of the below section and must contain PR
 Please add the latest change on the top under the correct section.
 -->
 
+## 0.14.1 (2023-01-16)
+
+### Fixes
+
+- remove overflow hidden from button [#6110](https://github.com/excalidraw/excalidraw/pull/6110). This fixes the collaborator count css in the [LiveCollaborationTrigger](https://github.com/excalidraw/excalidraw/blob/master/src/packages/excalidraw/README.md#LiveCollaborationTrigger) component.
+
 ## 0.14.0 (2023-01-13)
 
 ### Features
@@ -72,8 +78,6 @@ Please add the latest change on the top under the correct section.
 
 ### Fixes
 
-- remove overflow hidden from button [#6110](https://github.com/excalidraw/excalidraw/pull/6110)
-
 - Mobile tools positioning [#6107](https://github.com/excalidraw/excalidraw/pull/6107)
 
 - Renamed folder MainMenu->main-menu and support rest props [#6103](https://github.com/excalidraw/excalidraw/pull/6103)

src/packages/excalidraw/index.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect, forwardRef } from "react";
 import { InitializeApp } from "../../components/InitializeApp";
 import App from "../../components/App";
-import { isShallowEqual } from "../../utils";
 
 import "../../css/app.scss";
 import "../../css/styles.scss";
@@ -130,11 +129,6 @@ const areEqual = (
   prevProps: PublicExcalidrawProps,
   nextProps: PublicExcalidrawProps,
 ) => {
-  // short-circuit early
-  if (prevProps.children !== nextProps.children) {
-    return false;
-  }
-
   const {
     initialData: prevInitialData,
     UIOptions: prevUIOptions = {},
@@ -183,7 +177,13 @@ const areEqual = (
     return prevUIOptions[key] === nextUIOptions[key];
   });
 
-  return isUIOptionsSame && isShallowEqual(prev, next);
+  const prevKeys = Object.keys(prevProps) as (keyof typeof prev)[];
+  const nextKeys = Object.keys(nextProps) as (keyof typeof next)[];
+  return (
+    isUIOptionsSame &&
+    prevKeys.length === nextKeys.length &&
+    prevKeys.every((key) => prev[key] === next[key])
+  );
 };
 
 const forwardedRefComp = forwardRef<

src/packages/excalidraw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@excalidraw/excalidraw",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "main": "main.js",
   "types": "types/packages/excalidraw/index.d.ts",
   "files": [

src/utils.ts

@@ -728,15 +728,3 @@ export const getReactChildren = <
 
   return [knownChildren, restChildren] as const;
 };
-
-export const isShallowEqual = <T extends Record<string, any>>(
-  objA: T,
-  objB: T,
-) => {
-  const aKeys = Object.keys(objA);
-  const bKeys = Object.keys(objA);
-  if (aKeys.length !== bKeys.length) {
-    return false;
-  }
-  return aKeys.every((key) => objA[key] === objB[key]);
-};