Skip to content

Commit f122ba4

Browse files
Copy SketchAPI for Sketch 101
1 parent 29cb263 commit f122ba4

File tree

6 files changed

+23
-24
lines changed

6 files changed

+23
-24
lines changed

SketchAPI.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
437121332469F097000570FA /* Project object */ = {
114114
isa = PBXProject;
115115
attributes = {
116-
LastUpgradeCheck = 1340;
116+
LastUpgradeCheck = 1520;
117117
TargetAttributes = {
118118
4371214B2469F0F6000570FA = {
119119
CreatedOnToolsVersion = 11.4.1;
@@ -302,7 +302,7 @@
302302
"@executable_path/../Frameworks",
303303
"@loader_path/../Frameworks",
304304
);
305-
MACOSX_DEPLOYMENT_TARGET = 12.0;
305+
MACOSX_DEPLOYMENT_TARGET = 13.0;
306306
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
307307
MTL_FAST_MATH = YES;
308308
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -341,7 +341,7 @@
341341
"@executable_path/../Frameworks",
342342
"@loader_path/../Frameworks",
343343
);
344-
MACOSX_DEPLOYMENT_TARGET = 12.0;
344+
MACOSX_DEPLOYMENT_TARGET = 13.0;
345345
MTL_ENABLE_DEBUG_INFO = NO;
346346
MTL_FAST_MATH = YES;
347347
PRODUCT_NAME = "$(TARGET_NAME)";

SketchAPI.xcodeproj/xcshareddata/xcschemes/Sketch API.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ test('should transform the layer', () => {
307307
})
308308

309309
group.transform.rotation = 720
310-
expect(group.transform.rotation).toBe(0)
310+
expect(group.transform.rotation).toBe(720)
311311
})
312312

313313
// Regression #39358, SketchAPI#772.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ test('should have overrides', (_context, document) => {
3434
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
3535
instance.sketchObject.ensureDetachHasUpdated()
3636

37-
expect(instance.overrides.length).toBe(6)
37+
expect(instance.overrides.length).toBe(7)
3838
const override = instance.overrides[0]
3939
const result = {
4040
type: 'Override',

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ test('should create a symbol master with a nested symbol', (_context, document)
6666

6767
// add the instance to the page
6868
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
69-
expect(instance.overrides.length).toBe(14)
69+
expect(instance.overrides.length).toBe(17)
7070
canBeLogged(instance, SymbolInstance)
7171
const result0 = {
7272
type: 'Override',
@@ -97,7 +97,7 @@ test('should create a symbol master with a nested symbol', (_context, document)
9797
}
9898
delete result1.affectedLayer.overrides
9999
delete result1.affectedLayer.selected
100-
result1.affectedLayer.style = instance.overrides[7].affectedLayer.style.toJSON()
100+
result1.affectedLayer.style = instance.overrides[9].affectedLayer.style.toJSON()
101101
const result2 = {
102102
type: 'Override',
103103
id: `${nestedInstance.id}/${text.id}_stringValue`,
@@ -111,16 +111,16 @@ test('should create a symbol master with a nested symbol', (_context, document)
111111
selected: false,
112112
}
113113
delete result2.affectedLayer.selected
114-
result2.affectedLayer.style = instance.overrides[8].affectedLayer.style.toJSON()
114+
result2.affectedLayer.style = instance.overrides[10].affectedLayer.style.toJSON()
115115
expect(instance.overrides[0].toJSON()).toEqual(result0)
116-
expect(instance.overrides[7].toJSON()).toEqual(result1)
117-
expect(instance.overrides[8].toJSON()).toEqual(result2)
116+
expect(instance.overrides[9].toJSON()).toEqual(result1)
117+
expect(instance.overrides[10].toJSON()).toEqual(result2)
118118
})
119119

120120
test('should have overrides', (_context, document) => {
121121
const { master, text } = createSymbolMaster(document)
122122

123-
expect(master.overrides.length).toBe(6)
123+
expect(master.overrides.length).toBe(7)
124124
const override = master.overrides[0]
125125
const result = {
126126
type: 'Override',

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test('should be able to set overrides', (_context, document) => {
3232
const instance = master.createNewInstance()
3333
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
3434

35-
expect(instance.overrides.length).toBe(6)
35+
expect(instance.overrides.length).toBe(7)
3636
const override = instance.overrides[0]
3737
expect(override.isDefault).toBe(true)
3838
// check that an override can be logged
@@ -41,7 +41,7 @@ test('should be able to set overrides', (_context, document) => {
4141
// override
4242
override.value = 'overridden'
4343

44-
expect(instance.overrides.length).toBe(6)
44+
expect(instance.overrides.length).toBe(7)
4545
const result = {
4646
type: 'Override',
4747
id: `${text.id}_stringValue`,
@@ -79,9 +79,9 @@ test('should change a nested symbol', (_context, document) => {
7979

8080
// add the instance to the page
8181
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
82-
expect(instance.overrides.length).toBe(14)
82+
expect(instance.overrides.length).toBe(17)
8383

84-
const override = instance.overrides[7]
84+
const override = instance.overrides[9]
8585
override.value = nestedMaster2.symbolId
8686

8787
const result = {
@@ -98,8 +98,8 @@ test('should change a nested symbol', (_context, document) => {
9898
}
9999
delete result.affectedLayer.overrides
100100
delete result.affectedLayer.selected
101-
result.affectedLayer.style = instance.overrides[7].affectedLayer.style.toJSON()
102-
expect(instance.overrides[7].toJSON()).toEqual(result)
101+
result.affectedLayer.style = instance.overrides[9].affectedLayer.style.toJSON()
102+
expect(instance.overrides[9].toJSON()).toEqual(result)
103103
})
104104

105105
test('should handle image override', (_context, document) => {
@@ -121,8 +121,8 @@ test('should handle image override', (_context, document) => {
121121

122122
// add the instance to the page
123123
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
124-
expect(instance.overrides.length).toBe(2)
125-
124+
expect(instance.overrides.length).toBe(3)
125+
126126
// check image resize behavior
127127
expect(instance.overrides[0].property).toBe('imageResizeBehavior')
128128
expect(instance.overrides[0].isDefault).toBe(true)
@@ -148,15 +148,14 @@ test('should handle image override', (_context, document) => {
148148
expect(instance.overrides[1].value.type).toBe('ImageData')
149149
})
150150

151-
test('hidden layers should not be editable', (_context, document) => {
151+
test('hidden layers still editable', (_context, document) => {
152152
const { master } = createSymbolMaster(document)
153153
master.layers[0].hidden = true
154154
const instance = master.createNewInstance()
155155
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
156156

157-
// We used to test that hidden layers weren't marked as editable, but now hidden
158-
// layers don't surface overrides at all. #47514
159-
expect(instance.overrides.length).toBe(0)
157+
// Update for 51800 - overrides should be available in hidden layers
158+
expect(instance.overrides.length).toBe(7)
160159
})
161160

162161
test('should be able to select an override', (_context, document) => {

0 commit comments

Comments
 (0)