fix Group's mask pass and modify rnoh package name

harmony/svg/oh-package.json5

@@ -7,8 +7,8 @@
   "name": "@react-native-oh-tpl/react-native-svg",
   "description": "Native part of react-native-svg",
   "main": "index.ets",
-  "version": "13.14.0-0.2.4",
+  "version": "13.14.0-0.2.1",
   "dependencies": {
-    "rnoh": "file:../rnoh"
+    "@rnoh/react-native-openharmony": "file:../rnoh"
   }
 }

harmony/svg/src/main/ets/SVGComponentFactory.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Descriptor, ComponentBuilderContext, RNOHContext, Tag, RNComponentFactory } from 'rnoh'
+import { Descriptor, ComponentBuilderContext, RNOHContext, Tag, RNComponentFactory } from '@rnoh/react-native-openharmony'
 import { SVGGroup, SVG_GROUP_TYPE_NAME } from './components/SVGGroup'
 import { SVGPath, SVG_PATH_TYPE_NAME } from './components/SVGPath'
 import { SVGRect, SVG_RECT_TYPE_NAME } from './components/SVGRect'

harmony/svg/src/main/ets/SVGView.ets

@@ -30,7 +30,7 @@ import {
   ColorSegments,
   RNViewManager,
   ViewDescriptorWrapperBase,
-} from 'rnoh'
+} from '@rnoh/react-native-openharmony'
 import Logger from './common/log/Logger'
 import { getGroupBox, getScaleValue } from './common/SVGCommon'
 import { setViewDescriptor } from './common/SVGTempCache'

harmony/svg/src/main/ets/attributeModifiers/SVGEllipseModifier.ets

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import { convertColorValueToColorSegments } from 'rnoh';
+import { convertColorValueToColorSegments } from '@rnoh/react-native-openharmony';
 
 import {
   getColor,

harmony/svg/src/main/ets/attributeModifiers/SVGPathModifier.ets

@@ -36,7 +36,7 @@ import {
 import { SVGViewCommon, SVGViewRawCommon } from '../common/SVGType';
 import { SVGLinearGradientValue } from '../common/SVGLinearGradient';
 import { getMaskDescriptor } from '../common/SVGTempCache';
-import { convertColorValueToColorSegments } from 'rnoh';
+import { convertColorValueToColorSegments } from '@rnoh/react-native-openharmony';
 
 export class SVGPathModifier implements AttributeModifier<PathAttribute> {
   private constructor() {

harmony/svg/src/main/ets/attributeModifiers/SVGRectModifier.ets

@@ -39,7 +39,7 @@ import { SVGClipPathObj, SVGViewCommon, SVGViewRawCommon } from '../common/SVGTy
 import { getClipPathDescriptor, getMaskDescriptor } from '../common/SVGTempCache';
 import { SVGRectDescriptor, SVGRectDescriptorWrapper } from '../components/SVGRect';
 import { SVGLinearGradientValue } from '../common/SVGLinearGradient';
-import { convertColorValueToColorSegments } from 'rnoh';
+import { convertColorValueToColorSegments } from '@rnoh/react-native-openharmony';
 
 export class SVGRectModifier implements AttributeModifier<RectAttribute> {
   private constructor() {

harmony/svg/src/main/ets/attributeModifiers/SVGUseModifier.ets

@@ -1,4 +1,4 @@
-import { convertColorValueToColorSegments } from 'rnoh';
+import { convertColorValueToColorSegments } from '@rnoh/react-native-openharmony';
 import { getColor, getRawColor } from "../common/SVGCommon";
 import { SVGUseDescriptor } from "../components/SVGUse";
 

harmony/svg/src/main/ets/attributeModifiers/SVGViewModifier.ets

@@ -33,7 +33,7 @@ import {
   resolveBorderMetrics,
   RNOHContext,
   TransformMatrix
-} from 'rnoh';
+} from '@rnoh/react-native-openharmony';
 import matrix4 from '@ohos.matrix4';
 import { SVGViewDescriptor, SVGViewDescriptorWrapper } from '../SVGView';
 

harmony/svg/src/main/ets/common/SVGClipPathFactory.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Tag, RNOHContext, Descriptor } from 'rnoh'
+import { Tag, RNOHContext, Descriptor } from '@rnoh/react-native-openharmony'
 import { SVG_PATH_TYPE_NAME, SVGPathDescriptor } from "../components/SVGPath"
 import { SVG_RECT_TYPE_NAME, SVGRectDescriptor } from "../components/SVGRect"
 import { SVG_IMAGE_TYPE_NAME, SVGImageDescriptor } from "../components/SVGImage"

harmony/svg/src/main/ets/common/SVGCommon.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { ColorSegments, convertColorSegmentsToString, convertColorValueToHex, TransformMatrix } from 'rnoh'
+import { ColorSegments, convertColorSegmentsToString, convertColorValueToHex, TransformMatrix } from '@rnoh/react-native-openharmony'
 import { getLinearGradientValue } from './SVGTempCache'
 import { SVGColorValue, SVGRawColorValue, SVGGroupBox, SVGOffset } from './SVGType'
 import { SVGViewDescriptor } from '../SVGView'

harmony/svg/src/main/ets/common/SVGDefsFactory.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Tag, RNOHContext, Descriptor } from 'rnoh'
+import { Tag, RNOHContext, Descriptor } from '@rnoh/react-native-openharmony'
 import { SVG_PATH_TYPE_NAME, SVGPathDescriptor } from "../components/SVGPath"
 import { SVG_RECT_TYPE_NAME, SVGRectDescriptor } from "../components/SVGRect"
 import { SVG_IMAGE_TYPE_NAME, SVGImageDescriptor } from "../components/SVGImage"

harmony/svg/src/main/ets/common/SVGLinearGradient.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { convertColorValueToRGBA, Descriptor, RNOHContext, Tag } from 'rnoh'
+import { convertColorValueToRGBA, Descriptor, RNOHContext, Tag } from '@rnoh/react-native-openharmony'
 import Logger from './log/Logger'
 import { parseCoordinateValue } from './SVGCommon'
 import { setLinearGradientValue } from './SVGTempCache'

harmony/svg/src/main/ets/common/SVGMask.ets

@@ -1,4 +1,4 @@
-import { Descriptor, RNOHContext, Tag } from 'rnoh'
+import { Descriptor, RNOHContext, Tag } from '@rnoh/react-native-openharmony'
 import { SVGCircleDescriptor, SVG_CIRCLE_TYPE_NAME } from '../components/SVGCircle'
 import { SVGPathDescriptor, SVG_PATH_TYPE_NAME } from '../components/SVGPath'
 import { SVGRectDescriptor, SVG_RECT_TYPE_NAME } from '../components/SVGRect'

harmony/svg/src/main/ets/common/SVGMergeProperties.ets

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import { convertColorValueToColorSegments } from 'rnoh';
+import { convertColorValueToColorSegments } from '@rnoh/react-native-openharmony';
 
 import { ColorSegments, SVGColorValue, SVGRawColorValue } from './SVGType'
 

harmony/svg/src/main/ets/common/SVGTempCache.ets

@@ -26,7 +26,7 @@ import HashMap from '@ohos.util.HashMap'
 import { SVGViewDescriptor } from '../SVGView'
 import { SVGGroupDescriptor } from '../components/SVGGroup'
 import { SVGMaskType } from './SVGMask'
-import { Descriptor } from "rnoh";
+import { Descriptor } from "@rnoh/react-native-openharmony";
 import { SVGLinearGradientValue } from './SVGLinearGradient'
 
 const viewCache: HashMap<number, SVGViewDescriptor> = new HashMap()

harmony/svg/src/main/ets/common/SVGType.ts

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import { ViewBaseProps, ViewRawProps } from 'rnoh/ts';
+import { ViewBaseProps, ViewRawProps } from '@rnoh/react-native-openharmony/ts';
 
 /** 0-1 */
 export type NormalizedScalar = number

harmony/svg/src/main/ets/components/SVGCircle.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from 'rnoh'
+import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from '@rnoh/react-native-openharmony'
 import { SVGCircleModifier } from '../attributeModifiers/SVGCircleModifier'
 import Logger from '../common/log/Logger';
 import { getColor, getRawColor, getFillOpacity, getRawFillOpacity, getGradient, getOffset, getStrokeWidth, getTransform } from '../common/SVGCommon';

harmony/svg/src/main/ets/components/SVGEllipse.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from 'rnoh'
+import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from '@rnoh/react-native-openharmony'
 import { SVGEllipseModifier } from '../attributeModifiers/SVGEllipseModifier'
 import Logger from '../common/log/Logger';
 import { SVGEllipseProps, SVGViewCommon, SVGViewRawCommon, SVGState, SVGBaseRawProps } from '../common/SVGType'

harmony/svg/src/main/ets/components/SVGGroup.ets

@@ -24,7 +24,7 @@
  */
 
 import { Descriptor, RNOHContext, ComponentBuilderContext, Tag, ViewDescriptorWrapperBase,
-  convertColorValueToColorSegments } from 'rnoh'
+  convertColorValueToColorSegments } from '@rnoh/react-native-openharmony'
 import { SVGBaseProps, SVGBaseRawProps, SVGState, SVGGroupProps, SVGViewCommon, SVGViewRawCommon } from '../common/SVGType'
 import { setDefsDescriptor, setGroupDescriptor } from '../common/SVGTempCache'
 import { SVG_DEFS_TYPE_NAME, SVGDefsFactory } from '../common/SVGDefsFactory'
@@ -144,6 +144,9 @@ export struct SVGGroup {
       descriptor.layoutMetrics.frame.origin = this.descriptor.layoutMetrics.frame.origin
       descriptor.rawProps.fill = parseRawFill(descriptor.rawProps.fill, this.descriptor.rawProps.fill, this.svgViewCommon?.svgColor)
       descriptor.props.stroke = parseStroke(descriptor.props.stroke, this.descriptor.props.stroke, convertColorValueToColorSegments(this.svgViewCommon?.svgColor))
+      if (this.descriptor.props.mask) {
+        descriptor.props.mask = this.descriptor.props.mask
+      }
     }
   }
 

harmony/svg/src/main/ets/components/SVGImage.ets

@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 
-import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from 'rnoh'
-import { ImageLoaderTurboModule } from 'rnoh/src/main/ets/RNOHCorePackage/turboModules';
+import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from '@rnoh/react-native-openharmony'
+import { ImageLoaderTurboModule } from '@rnoh/react-native-openharmony/src/main/ets/RNOHCorePackage/turboModules';
 import { SVGImageModifier } from '../attributeModifiers/SVGImageModifier';
 import Logger from '../common/log/Logger';
 import { SVGImageProps, SVGViewCommon, SVGViewRawCommon, SVGBaseRawProps, SVGState } from '../common/SVGType'
-import { RemoteImageLoaderError } from 'rnoh/src/main/ets/RemoteImageLoader/RemoteImageLoaderError';
+import { RemoteImageLoaderError } from '@rnoh/react-native-openharmony/src/main/ets/RemoteImageLoader/RemoteImageLoaderError';
 
 export const SVG_IMAGE_TYPE_NAME: string = "RNSVGImage"
 

harmony/svg/src/main/ets/components/SVGPath.ets

@@ -22,11 +22,9 @@
  * SOFTWARE.
  */
 
-import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from 'rnoh'
+import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from '@rnoh/react-native-openharmony'
 import Logger from '../common/log/Logger'
 import { SVGPathProps, SVGViewCommon, SVGViewRawCommon, SVGBaseRawProps, SVGState } from '../common/SVGType'
-import { SVGLinearGradientValue } from '../common/SVGLinearGradient'
-import emitter from '@ohos.events.emitter';
 import { SVGPathModifier } from '../attributeModifiers/SVGPathModifier'
 
 export const SVG_PATH_TYPE_NAME: string = "RNSVGPath"

harmony/svg/src/main/ets/components/SVGRect.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from 'rnoh'
+import { Descriptor, RNOHContext, ViewDescriptorWrapperBase } from '@rnoh/react-native-openharmony'
 import { SVGRectModifier } from '../attributeModifiers/SVGRectModifier'
 import Logger from '../common/log/Logger'
 import { SVGRectProps, SVGViewCommon, SVGViewRawCommon, SVGBaseRawProps, SVGState } from '../common/SVGType'

harmony/svg/src/main/ets/components/SVGTSpan.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Descriptor, RNOHContext,ViewDescriptorWrapperBase } from 'rnoh'
+import { Descriptor, RNOHContext,ViewDescriptorWrapperBase } from '@rnoh/react-native-openharmony'
 import { SVGTSpanModifier } from '../attributeModifiers/SVGTSpanModifier'
 import Logger from '../common/log/Logger'
 import { getOffset } from '../common/SVGCommon'

harmony/svg/src/main/ets/components/SVGText.ets

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Descriptor, RNOHContext, Tag, ViewDescriptorWrapperBase } from 'rnoh'
+import { Descriptor, RNOHContext, Tag, ViewDescriptorWrapperBase } from '@rnoh/react-native-openharmony'
 import { SVGTextModifier } from '../attributeModifiers/SVGTextModifier'
 import Logger from '../common/log/Logger'
 import { getOffset } from '../common/SVGCommon'

harmony/svg/src/main/ets/components/SVGUse.ets

@@ -1,4 +1,4 @@
-import { Descriptor, RNOHContext, Tag } from "rnoh";
+import { Descriptor, RNOHContext, Tag } from "@rnoh/react-native-openharmony";
 import { SVGUseModifier } from "../attributeModifiers/SVGUseModifier";
 import { getDefsDescriptor } from "../common/SVGTempCache";
 import { SVGUseProps, SVGState, SVGBaseRawProps } from "../common/SVGType";