Merge pull request #2061 from Shopify/drawing

Remove drawing node

Author: wcandillon

docs/docs/shapes/custom-drawing.md

@@ -54,7 +54,6 @@ const sidebars = {
         "shapes/vertices",
         "shapes/patch",
         "shapes/pictures",
-        "shapes/custom-drawing",
       ],
     },
     {

docs/sidebars.js

@@ -40,8 +40,6 @@
 #include "nodes/JsiBoxNode.h"
 #include "nodes/JsiBoxShadowNode.h"
 
-#include "nodes/JsiCustomDrawingNode.h"
-
 #include "nodes/JsiGlyphsNode.h"
 #include "nodes/JsiTextBlobNode.h"
 #include "nodes/JsiTextNode.h"
@@ -154,9 +152,6 @@ class JsiDomApi : public JsiHostObject {
     installFunction("BoxNode", JsiBoxNode::createCtor(context));
     installFunction("BoxShadowNode", JsiBoxShadowNode::createCtor(context));
 
-    installFunction("CustomDrawingNode",
-                    JsiCustomDrawingNode::createCtor(context));
-
     installFunction("GlyphsNode", JsiGlyphsNode::createCtor(context));
     installFunction("TextNode", JsiTextNode::createCtor(context));
     installFunction("TextPathNode", JsiTextPathNode::createCtor(context));

package/cpp/rnskia/dom/JsiDomApi.h

@@ -11,7 +11,6 @@ import type {
   PaintProps,
   ShaderProps,
   ImageShaderProps,
-  CustomDrawingNodeProps,
   LineProps,
   OvalProps,
   PatchProps,
@@ -72,7 +71,6 @@ import {
   VerticesNode,
   TextNode,
   OvalNode,
-  CustomDrawingNode,
   TextPathNode,
   TextBlobNode,
   GlyphsNode,
@@ -172,16 +170,6 @@ export class JsiSkDOM implements SkDOM {
       : new PathNode(this.ctx, props);
   }
 
-  CustomDrawing(props: CustomDrawingNodeProps) {
-    console.warn(
-      // eslint-disable-next-line max-len
-      "The <Drawing /> component is deprecated and will be removed in the next release. For custom drawings, please sure the <Picture /> component: https://shopify.github.io/react-native-skia/docs/shapes/pictures/"
-    );
-    return NATIVE_DOM
-      ? global.SkiaDomApi.CustomDrawingNode(props ?? {})
-      : new CustomDrawingNode(this.ctx, props);
-  }
-
   Line(props: LineProps) {
     return NATIVE_DOM
       ? global.SkiaDomApi.LineNode(props ?? {})

package/cpp/rnskia/dom/nodes/JsiCustomDrawingNode.h

@@ -9,7 +9,6 @@ export * from "./OvalNode";
 export * from "./LineNode";
 export * from "./PatchNode";
 export * from "./VerticesNode";
-export * from "./CustomDrawingNode";
 export * from "./Text";
 export * from "./PictureNode";
 export * from "./DiffRectNode";

package/cpp/rnskia/dom/props/DrawingProp.h

@@ -26,7 +26,6 @@ import type {
   RRectDef,
   SkEnum,
 } from "./Common";
-import type { DrawingContext } from "./DrawingContext";
 
 export interface DrawingNodeProps extends GroupProps {
   paint?: SkPaint;
@@ -48,10 +47,6 @@ export interface PathProps extends DrawingNodeProps {
   fillType?: SkEnum<typeof FillType>;
 }
 
-export interface CustomDrawingNodeProps extends DrawingNodeProps {
-  drawing: (ctx: DrawingContext) => void;
-}
-
 export interface LineProps extends DrawingNodeProps {
   p1: Vector;
   p2: Vector;

package/src/dom/nodes/JsiSkDOM.ts

@@ -48,7 +48,6 @@ export const enum NodeType {
 
   // Drawings
   Group = "skGroup",
-  Drawing = "skDrawing",
   Paint = "skPaint",
   Circle = "skCircle",
   Fill = "skFill",