@react-native-ohos/react-native-svg 15.12.1-rc.15 → 15.12.1-rc.16

package/harmony/svg/oh-package.json5

@@ -6,7 +6,7 @@
   name: '@react-native-ohos/react-native-svg',
   type: 'module',
   main: 'index.ets',
-  version: '15.12.1-rc.15',
+  version: '15.12.1-rc.16',
   dependencies: {
     "@rnoh/react-native-openharmony": "file:../../node_modules/@react-native-oh/react-native-harmony/harmony/react_native_openharmony.har"
   },

package/harmony/svg/src/main/cpp/SvgQuote.h

@@ -36,6 +36,11 @@ public:
         DLOG(INFO) << "[SvgQuote] getClipPath";
         for (const auto &child : children_) {
             auto childPath = child->AsPath();
+               // Apply child's transform to the path (use child's scale for correct transformation)
+ 	             const auto &transform = child->GetBaseAttributes().transform;
+ 	             double childScale = child->GetScale();
+ 	             DLOG(INFO) << "[SvgQuote] child transform size: " << transform.size() << ", childScale: " << childScale;
+ 	             applyTransformToPath(childPath, transform, childScale);
             path.AddPath(childPath);
         }
         return path;
@@ -45,11 +50,36 @@ public:
         DLOG(INFO) << "[SvgQuote] getClipPath with op, op = " << op;
         for (const auto &child : children_) {
             auto childPath = child->AsPath();
+                       // Apply child's transform to the path (use child's scale for correct transformation)
+ 	             const auto &transform = child->GetBaseAttributes().transform;
+ 	             double childScale = child->GetScale();
+ 	             DLOG(INFO) << "[SvgQuote] child transform size: " << transform.size() << ", childScale: " << childScale;
+ 	             applyTransformToPath(childPath, transform, childScale);
             path.Op(childPath, op);
         }
         return path;
     }
 
+    private:
+ 	     void applyTransformToPath(drawing::Path &path, const std::vector<double> &transform, double childScale) {
+ 	         if (transform.size() >= 6) {
+ 	             // transform array: [scaleX, skewY, skewX, scaleY, transX, transY]
+ 	             drawing::Matrix matrix;
+ 	             matrix.SetMatrix(
+ 	                 static_cast<float>(transform[0]),  // scaleX
+ 	                 static_cast<float>(transform[2]),  // skewX
+ 	                 static_cast<float>(transform[4] * childScale),  // transX
+ 	                 static_cast<float>(transform[1]),  // skewY
+ 	                 static_cast<float>(transform[3]),  // scaleY
+ 	                 static_cast<float>(transform[5] * childScale),  // transY
+ 	                 0, 0, 1.0f
+ 	             );
+ 	             path.Transform(matrix);
+ 	         }
+ 	     }
+ 	 
+ 	 public:
+
     drawing::Path AsPath() override {
         DLOG(INFO) << "[SvgQuote] AsPath";
         drawing::Path path;

package/lib/commonjs/css/index.js

@@ -1,55 +1,55 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "LocalSvg", {
-  enumerable: true,
-  get: function () {
-    return _css.LocalSvg;
-  }
-});
-Object.defineProperty(exports, "SvgCss", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgCss;
-  }
-});
-Object.defineProperty(exports, "SvgCssUri", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgCssUri;
-  }
-});
-Object.defineProperty(exports, "SvgWithCss", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgWithCss;
-  }
-});
-Object.defineProperty(exports, "SvgWithCssUri", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgWithCssUri;
-  }
-});
-Object.defineProperty(exports, "WithLocalSvg", {
-  enumerable: true,
-  get: function () {
-    return _css.WithLocalSvg;
-  }
-});
-Object.defineProperty(exports, "inlineStyles", {
-  enumerable: true,
-  get: function () {
-    return _css.inlineStyles;
-  }
-});
-Object.defineProperty(exports, "loadLocalRawResource", {
-  enumerable: true,
-  get: function () {
-    return _css.loadLocalRawResource;
-  }
-});
-var _css = require("react-native-svg/css");
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "LocalSvg", {
+  enumerable: true,
+  get: function () {
+    return _css.LocalSvg;
+  }
+});
+Object.defineProperty(exports, "SvgCss", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgCss;
+  }
+});
+Object.defineProperty(exports, "SvgCssUri", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgCssUri;
+  }
+});
+Object.defineProperty(exports, "SvgWithCss", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgWithCss;
+  }
+});
+Object.defineProperty(exports, "SvgWithCssUri", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgWithCssUri;
+  }
+});
+Object.defineProperty(exports, "WithLocalSvg", {
+  enumerable: true,
+  get: function () {
+    return _css.WithLocalSvg;
+  }
+});
+Object.defineProperty(exports, "inlineStyles", {
+  enumerable: true,
+  get: function () {
+    return _css.inlineStyles;
+  }
+});
+Object.defineProperty(exports, "loadLocalRawResource", {
+  enumerable: true,
+  get: function () {
+    return _css.loadLocalRawResource;
+  }
+});
+var _css = require("react-native-svg/css");
 //# sourceMappingURL=index.js.map

package/lib/commonjs/css/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_css","require"],"sourceRoot":"..\\..\\..\\src","sources":["css/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA","ignoreList":[]}
+{"version":3,"names":["_css","require"],"sourceRoot":"../../../src","sources":["css/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA","ignoreList":[]}

package/lib/commonjs/index.js

@@ -1,26 +1,26 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {};
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _ReactNativeSVG.default;
-  }
-});
-var _ReactNativeSVG = _interopRequireWildcard(require("react-native-svg/src/ReactNativeSVG"));
-Object.keys(_ReactNativeSVG).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ReactNativeSVG[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ReactNativeSVG[key];
-    }
-  });
-});
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _ReactNativeSVG.default;
+  }
+});
+var _ReactNativeSVG = _interopRequireWildcard(require("react-native-svg/src/ReactNativeSVG"));
+Object.keys(_ReactNativeSVG).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _ReactNativeSVG[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ReactNativeSVG[key];
+    }
+  });
+});
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ReactNativeSVG","_interopRequireWildcard","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor"],"sourceRoot":"..\\..\\src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,uBAAA,CAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAJ,eAAA,EAAAK,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAN,eAAA,CAAAM,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAd,eAAA,CAAAM,GAAA;IAAA;EAAA;AAAA;AAAoD,SAAAL,wBAAAc,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAhB,uBAAA,YAAAA,CAAAc,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAP,GAAA,CAAAC,CAAA,GAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAR,cAAA,CAAAC,IAAA,CAAAM,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAlB,MAAA,CAAAS,cAAA,KAAAT,MAAA,CAAAyB,wBAAA,CAAAb,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAR,GAAA,IAAAQ,CAAA,CAAAK,GAAA,IAAAN,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA","ignoreList":[]}
+{"version":3,"names":["_ReactNativeSVG","_interopRequireWildcard","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,uBAAA,CAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAJ,eAAA,EAAAK,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAN,eAAA,CAAAM,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAd,eAAA,CAAAM,GAAA;IAAA;EAAA;AAAA;AAAoD,SAAAL,wBAAAc,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAhB,uBAAA,YAAAA,CAAAc,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAP,GAAA,CAAAC,CAAA,GAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAR,cAAA,CAAAC,IAAA,CAAAM,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAlB,MAAA,CAAAS,cAAA,KAAAT,MAAA,CAAAyB,wBAAA,CAAAb,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAR,GAAA,IAAAQ,CAAA,CAAAK,GAAA,IAAAN,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA","ignoreList":[]}

package/lib/module/css/index.js

@@ -1,4 +1,4 @@
-import { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles } from 'react-native-svg/css';
-import { LocalSvg, WithLocalSvg, loadLocalRawResource } from 'react-native-svg/css';
-export { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles, LocalSvg, WithLocalSvg, loadLocalRawResource };
+import { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles } from 'react-native-svg/css';
+import { LocalSvg, WithLocalSvg, loadLocalRawResource } from 'react-native-svg/css';
+export { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles, LocalSvg, WithLocalSvg, loadLocalRawResource };
 //# sourceMappingURL=index.js.map

package/lib/module/css/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["SvgCss","SvgCssUri","SvgWithCss","SvgWithCssUri","inlineStyles","LocalSvg","WithLocalSvg","loadLocalRawResource"],"sourceRoot":"..\\..\\..\\src","sources":["css/index.tsx"],"mappings":"AAAA,SACIA,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,QACP,sBAAsB;AAE7B,SAASC,QAAQ,EAAEC,YAAY,EAAEC,oBAAoB,QAAQ,sBAAsB;AAEnF,SACEP,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,EACZC,QAAQ,EACRC,YAAY,EACZC,oBAAoB","ignoreList":[]}
+{"version":3,"names":["SvgCss","SvgCssUri","SvgWithCss","SvgWithCssUri","inlineStyles","LocalSvg","WithLocalSvg","loadLocalRawResource"],"sourceRoot":"../../../src","sources":["css/index.tsx"],"mappings":"AAAA,SACIA,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,QACP,sBAAsB;AAE7B,SAASC,QAAQ,EAAEC,YAAY,EAAEC,oBAAoB,QAAQ,sBAAsB;AAEnF,SACEP,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,EACZC,QAAQ,EACRC,YAAY,EACZC,oBAAoB","ignoreList":[]}

package/lib/module/index.js

@@ -1,3 +1,3 @@
-export * from 'react-native-svg/src/ReactNativeSVG';
-export { default } from 'react-native-svg/src/ReactNativeSVG';
+export * from 'react-native-svg/src/ReactNativeSVG';
+export { default } from 'react-native-svg/src/ReactNativeSVG';
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["default"],"sourceRoot":"..\\..\\src","sources":["index.tsx"],"mappings":"AAAA,cAAc,qCAAqC;AAEnD,SAASA,OAAO,QAAQ,qCAAqC","ignoreList":[]}
+{"version":3,"names":["default"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,cAAc,qCAAqC;AAEnD,SAASA,OAAO,QAAQ,qCAAqC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-svg",
-  "version": "15.12.1-rc.15",
+  "version": "15.12.1-rc.16",
   "description": "",
   "react-native": "src/index",
   "main": "lib/commonjs/index",
@@ -46,7 +46,8 @@
     "output": "lib",
     "targets": [
       "commonjs",
-      "module"
+      "module",
+      "typescript"
     ]
   }
 }