Update with release/2025.1-7b9e09e9

Author: jpedroso

Source/dom/__tests__/import.test.js

@@ -8,14 +8,15 @@ test('should create Group from an SVG', () => {
 
   const group = createLayerFromData(svgString, 'svg')
   expect(group.type).toEqual('Group')
+  expect(group.groupBehavior).toEqual(2) // Graphic
   expect(group.layers.length).toEqual(1)
   expect(group.layers[0].type).toEqual('ShapePath')
   expect(group.layers[0].shapeType).toEqual('Rectangle')
   expect(group.layers[0].frame.width).toEqual(200)
   expect(group.layers[0].frame.height).toEqual(100)
 })
 
-test('should create shape from a PDF', (_context, document) => {
+test('should create group from a PDF', (_context, document) => {
   const layer = new Shape({
     parent: document.selectedPage,
     frame: new Rectangle(0, 0, 200, 100),
@@ -32,7 +33,7 @@ test('should create shape from a PDF', (_context, document) => {
     output: null,
   })
   const imported = createLayerFromData(buffer, 'pdf')
-  expect(imported.type).toEqual('ShapePath')
+  expect(imported.type).toEqual('Group')
   expect(imported.frame.width).toEqual(200)
   expect(imported.frame.height).toEqual(100)
 })

Source/dom/layers/Text.js

@@ -1,4 +1,5 @@
 import { DefinedPropertiesKey } from '../WrappedObject'
+import { FlexSizing } from './Layer'
 import { StyledLayer } from './StyledLayer'
 import { Rectangle } from '../models/Rectangle'
 import { Types } from '../enums'
@@ -266,9 +267,11 @@ Text.define('fixedWidth', {
       return
     }
     if (fixed) {
-      this._object.setTextBehaviour(TextBehaviour.fixedWidth)
+      this.horizontalSizing = FlexSizing.Fixed
+      this.verticalSizing = FlexSizing.Fit
     } else {
-      this._object.setTextBehaviour(TextBehaviour.flexibleWidth)
+      this.horizontalSizing = FlexSizing.Fit
+      this.verticalSizing = FlexSizing.Fit
     }
   },
 })

Source/dom/layers/__tests__/SymbolInstance.test.js

@@ -34,7 +34,8 @@ test('should have overrides', (_context, document) => {
   document.selectedPage.layers = document.selectedPage.layers.concat(instance)
   instance.sketchObject.ensureDetachHasUpdated()
 
-  expect(instance.overrides.length).toBe(11)
+  expect(instance.overrides.length).toBe(10)
+
   const override = instance.overrides.find(o => o.property === 'stringValue')
   const result = {
     type: 'Override',

Source/dom/layers/__tests__/SymbolMaster.test.js

@@ -142,7 +142,7 @@ test('should create a symbol master with a nested symbol', (_context, document)
 test('should have overrides', (_context, document) => {
   const { master, text } = createSymbolMaster(document)
 
-  expect(master.overrides.length).toBe(9)
+  expect(master.overrides.length).toBe(10)
   const override = master.overrides.find(o => o.property === 'stringValue')
   const result = {
     type: 'Override',
@@ -157,7 +157,8 @@ test('should have overrides', (_context, document) => {
     selected: false,
   }
   delete result.affectedLayer.selected
-  result.affectedLayer.style = master.overrides[0].affectedLayer.style.toJSON()
+  const overrideAfter = master.overrides.find(o => o.property === 'stringValue')
+  result.affectedLayer.style = overrideAfter.affectedLayer.style.toJSON()
   expect(override.toJSON()).toEqual(result)
 })
 

Source/dom/models/CurvePoint.js

@@ -76,30 +76,7 @@ CurvePoint.define('cornerRadius', {
     if (parent) {
       parent.setEdited(true)
       parent.adjustFrameAfterEditIntegral(false)
-    
-      if (parent.isKindOfClass(MSRectangleShape)) {
-        // Rectangle shapes have a `fixedRadius` property we need to manually update
-        // to the first point's radius (sketch-hq/SketchAPI#775, #39183).
-        const firstPoint = parent.points().firstObject()
-
-        if (firstPoint === this._object) {
-          // We changed the first point, so we need to update the fixed radius.
-          parent.setFixedRadius(cornerRadius)
-        } else {
-          // The inspector only updates if we change the fixed radius. Since we haven't
-          // changed it in this case, we need to manually reload the current inspector.
-          const document = Document.getSelectedDocument()
-          if (document) {
-            const inspectorController = document.sketchObject.inspectorController()
-            if (inspectorController) {
-              const currentController = inspectorController.currentController()
-              if (currentController) {
-                currentController.prepareForDisplay()
-              }
-            }
-          }
-        }
-      }
+      parent.propagateCornerRadiusToStyle()
     }
   },
 })

Source/dom/models/__tests__/CurvePoint.test.js

@@ -41,8 +41,6 @@ test('should be able to modify the corner radius of a rectangle\'s CurvePoint',
   rectangle.points[1].cornerRadius = cornerRadius
   expect(toArray(rectangle.sketchObject.CSSAttributes()).join(''))
     .toEqual('border-radius: 0 ' + cornerRadius + 'px 0 0;')
-  expect(rectangle.sketchObject.fixedRadius())
-    .toEqual(0)
 })
 
 test('should be able to modify the corner radius of a rectangle\'s first CurvePoint', () => {
@@ -52,8 +50,6 @@ test('should be able to modify the corner radius of a rectangle\'s first CurvePo
   rectangle.points[0].cornerRadius = cornerRadius
   expect(toArray(rectangle.sketchObject.CSSAttributes()).join(''))
     .toEqual('border-radius: ' + cornerRadius + 'px 0 0 0;')
-  expect(rectangle.sketchObject.fixedRadius())
-    .toEqual(cornerRadius)
 })
 
 // sketch-hq/SketchAPI#775, #39183.
@@ -64,7 +60,7 @@ test('should be able to modify the corner radius of every rectangle\'s CurvePoin
   rectangle.points.forEach(point => point.cornerRadius = cornerRadius)
   expect(toArray(rectangle.sketchObject.CSSAttributes()).join(''))
     .toEqual('border-radius: ' + cornerRadius + 'px;')
-  expect(rectangle.sketchObject.fixedRadius())
+  expect(rectangle.sketchObject.cornerRadius())
     .toEqual(cornerRadius)
 })
 

Source/dom/models/__tests__/Override.test.js

@@ -32,7 +32,7 @@ test('should be able to set overrides', (_context, document) => {
   const instance = master.createNewInstance()
   document.selectedPage.layers = document.selectedPage.layers.concat(instance)
 
-  expect(instance.overrides.length).toBe(11)
+  expect(instance.overrides.length).toBe(10)
 
   // find the override point for the text layer's string value
   const override = instance.overrides.find(o => o.property === 'stringValue')
@@ -43,7 +43,7 @@ test('should be able to set overrides', (_context, document) => {
   // override
   override.value = 'overridden'
 
-  expect(instance.overrides.length).toBe(11)
+  expect(instance.overrides.length).toBe(10)
   const result = {
     type: 'Override',
     id: `${text.id}_stringValue`,
@@ -135,7 +135,7 @@ test('should handle image override', (_context, document) => {
 
   // add the instance to the page
   document.selectedPage.layers = document.selectedPage.layers.concat(instance)
-  expect(instance.overrides.length).toBe(7)
+  expect(instance.overrides.length).toBe(6)
 
   // check image resize behavior
   const imageResizeOverride = instance.overrides.find(o => o.property === 'imageResizeBehavior')
@@ -168,7 +168,7 @@ test('hidden layers still editable', (_context, document) => {
   document.selectedPage.layers = document.selectedPage.layers.concat(instance)
 
   // Update for 51800 - overrides should be available in hidden layers
-  expect(instance.overrides.length).toBe(11)
+  expect(instance.overrides.length).toBe(10)
 })
 
 test('should be able to select an override', (_context, document) => {