Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy SketchAPI for Sketch 101 #924

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Copy SketchAPI for Sketch 101 #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SketchAPI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
437121332469F097000570FA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1340;
LastUpgradeCheck = 1520;
TargetAttributes = {
4371214B2469F0F6000570FA = {
CreatedOnToolsVersion = 11.4.1;
Expand Down Expand Up @@ -302,7 +302,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -341,7 +341,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion SketchAPI.xcodeproj/xcshareddata/xcschemes/Sketch API.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Source/dom/layers/__tests__/Layer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ test('should transform the layer', () => {
})

group.transform.rotation = 720
expect(group.transform.rotation).toBe(0)
expect(group.transform.rotation).toBe(720)
})

// Regression #39358, SketchAPI#772.
Expand Down
2 changes: 1 addition & 1 deletion Source/dom/layers/__tests__/SymbolInstance.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ test('should have overrides', (_context, document) => {
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
instance.sketchObject.ensureDetachHasUpdated()

expect(instance.overrides.length).toBe(6)
expect(instance.overrides.length).toBe(7)
const override = instance.overrides[0]
const result = {
type: 'Override',
Expand Down
12 changes: 6 additions & 6 deletions Source/dom/layers/__tests__/SymbolMaster.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ test('should create a symbol master with a nested symbol', (_context, document)

// add the instance to the page
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
expect(instance.overrides.length).toBe(14)
expect(instance.overrides.length).toBe(17)
canBeLogged(instance, SymbolInstance)
const result0 = {
type: 'Override',
Expand Down Expand Up @@ -97,7 +97,7 @@ test('should create a symbol master with a nested symbol', (_context, document)
}
delete result1.affectedLayer.overrides
delete result1.affectedLayer.selected
result1.affectedLayer.style = instance.overrides[7].affectedLayer.style.toJSON()
result1.affectedLayer.style = instance.overrides[9].affectedLayer.style.toJSON()
const result2 = {
type: 'Override',
id: `${nestedInstance.id}/${text.id}_stringValue`,
Expand All @@ -111,16 +111,16 @@ test('should create a symbol master with a nested symbol', (_context, document)
selected: false,
}
delete result2.affectedLayer.selected
result2.affectedLayer.style = instance.overrides[8].affectedLayer.style.toJSON()
result2.affectedLayer.style = instance.overrides[10].affectedLayer.style.toJSON()
expect(instance.overrides[0].toJSON()).toEqual(result0)
expect(instance.overrides[7].toJSON()).toEqual(result1)
expect(instance.overrides[8].toJSON()).toEqual(result2)
expect(instance.overrides[9].toJSON()).toEqual(result1)
expect(instance.overrides[10].toJSON()).toEqual(result2)
})

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

expect(master.overrides.length).toBe(6)
expect(master.overrides.length).toBe(7)
const override = master.overrides[0]
const result = {
type: 'Override',
Expand Down
23 changes: 11 additions & 12 deletions Source/dom/models/__tests__/Override.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(6)
expect(instance.overrides.length).toBe(7)
const override = instance.overrides[0]
expect(override.isDefault).toBe(true)
// check that an override can be logged
Expand All @@ -41,7 +41,7 @@ test('should be able to set overrides', (_context, document) => {
// override
override.value = 'overridden'

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

// add the instance to the page
document.selectedPage.layers = document.selectedPage.layers.concat(instance)
expect(instance.overrides.length).toBe(14)
expect(instance.overrides.length).toBe(17)

const override = instance.overrides[7]
const override = instance.overrides[9]
override.value = nestedMaster2.symbolId

const result = {
Expand All @@ -98,8 +98,8 @@ test('should change a nested symbol', (_context, document) => {
}
delete result.affectedLayer.overrides
delete result.affectedLayer.selected
result.affectedLayer.style = instance.overrides[7].affectedLayer.style.toJSON()
expect(instance.overrides[7].toJSON()).toEqual(result)
result.affectedLayer.style = instance.overrides[9].affectedLayer.style.toJSON()
expect(instance.overrides[9].toJSON()).toEqual(result)
})

test('should handle image override', (_context, document) => {
Expand All @@ -121,8 +121,8 @@ 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(2)
expect(instance.overrides.length).toBe(3)

// check image resize behavior
expect(instance.overrides[0].property).toBe('imageResizeBehavior')
expect(instance.overrides[0].isDefault).toBe(true)
Expand All @@ -148,15 +148,14 @@ test('should handle image override', (_context, document) => {
expect(instance.overrides[1].value.type).toBe('ImageData')
})

test('hidden layers should not be editable', (_context, document) => {
test('hidden layers still editable', (_context, document) => {
const { master } = createSymbolMaster(document)
master.layers[0].hidden = true
const instance = master.createNewInstance()
document.selectedPage.layers = document.selectedPage.layers.concat(instance)

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

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