Merge branch 'main' into wcandillon-patch-52

Shopify · Dec 18, 2024 · 0e4e74f · 0e4e74f
2 parents 0226cd7 + cca99c4
commit 0e4e74f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/apps/docs/docs/canvas/contexts.md b/apps/docs/docs/canvas/contexts.md
@@ -13,39 +13,6 @@ However, if you need to use a React context within your drawing, you must re-inj
 
 We found [its-fine](https://github.com/pmndrs/its-fine), also used by [react-three-fiber](https://github.com/pmndrs/react-three-fiber), to provide an elegant solution to this problem.
 
-## Manual Context Injection
-
-```tsx twoslash
-import React from "react";
-import { Canvas, Fill } from "@shopify/react-native-skia";
-import {useTheme, ThemeProvider} from "./docs/getting-started/Theme";
-
-const MyDrawing = () => {
-  const { primary } = useTheme();
-  return <Fill color={primary} />;
-};
-
-export const Layer = () => {
-  const theme = useTheme();
-  return (
-    <Canvas style={{ flex: 1 }}>
-      {/* We need to re-inject the context provider here.  */}
-      <ThemeProvider primary={theme.primary}>
-        <MyDrawing />
-      </ThemeProvider>
-    </Canvas>
-  );
-};
-
-export const App = () => {
-  return (
-    <ThemeProvider primary="red">
-      <Layer />
-    </ThemeProvider>
-  );
-};
-```
-
 ## Using `its-fine`
 
 ```tsx twoslash

diff --git a/packages/skia/src/views/SkiaDomView.tsx b/packages/skia/src/views/SkiaDomView.tsx
@@ -52,7 +52,9 @@ export class SkiaDomView extends React.Component<SkiaDomViewProps> {
       assertSkiaViewApi();
       SkiaViewApi.setJsiProperty(this._nativeId, "onSize", onSize);
     }
-    this.tick();
+    if (onSize !== prevProps.onSize || root !== prevProps.root) {
+      this.tick();
+    }
   }
 
   componentWillUnmount(): void {