Fixed bugs.

Author: Ashung

automate-sketch.sketchplugin/Contents/Resources/manifest_en.json

@@ -5,7 +5,7 @@
   "email": "Ashung.hung@gmail.com",
   "homepage": "https://github.com/Ashung/Automate-Sketch",
   "appcast": "https://ashung.github.io/Automate-Sketch/appcast.xml",
-  "version": "93.0.20220921",
+  "version": "96.3.20230530",
   "identifier": "com.ashung.hung.automate_sketch",
   "icon": "icon.png",
   "suppliesData": true,
@@ -307,7 +307,7 @@
       "icon": "icon_runner.png"
     },
     {
-      "name": "Artboard from Selection",
+      "name": "Artboards from Selection",
       "identifier": "artboard_from_selection",
       "script": "Artboard/Artboard_from_Selection.js",
       "icon": "icon_runner.png"

automate-sketch.sketchplugin/Contents/Resources/manifest_zh.json

@@ -5,7 +5,7 @@
   "email": "Ashung.hung@gmail.com",
   "homepage": "https://github.com/Ashung/Automate-Sketch",
   "appcast": "https://ashung.github.io/Automate-Sketch/appcast.xml",
-  "version": "93.0.20220921",
+  "version": "96.3.20230530",
   "identifier": "com.ashung.hung.automate_sketch",
   "icon": "icon.png",
   "suppliesData": true,
@@ -307,7 +307,7 @@
       "icon": "icon_runner.png"
     },
     {
-      "name": "从选择对象新建画板",
+      "name": "从选择对象新建多画板",
       "identifier": "artboard_from_selection",
       "script": "Artboard/Artboard_from_Selection.js",
       "icon": "icon_runner.png"

automate-sketch.sketchplugin/Contents/Sketch/Artboard/Paste_as_Artboard_or_Symbol_Master.js

@@ -8,6 +8,7 @@ var onRun = function(context) {
 
     var util = require("util");
     var sketch = require("sketch/dom");
+    var version = sketch.version.sketch;
     var message = require("sketch/ui").message;
     var Artboard = sketch.Artboard;
     var SymbolMaster = sketch.SymbolMaster;
@@ -25,7 +26,13 @@ var onRun = function(context) {
     document.selectedLayers.clear();
 
     util.toArray(layersFromPasteboard).forEach(function(layer) {
-        var layerInfluenceRect = layer.absoluteInfluenceRect();
+        var layerInfluenceRect;
+        if (version >= 96) {
+            var relativeInfluenceRect = layer.immutableModelObject().influenceRectForBoundsInDocument(layer.documentData());
+            layerInfluenceRect = layer.convertRect_toLayer(relativeInfluenceRect, null);
+        } else {
+            layerInfluenceRect = layer.absoluteInfluenceRect();
+        }
         var layerRect = layer.rect();
         var originForNewArtboard = page.sketchObject.originForNewArtboardWithSize(layerInfluenceRect.size);
         layer.frame().setX(Math.round(layerRect.origin.x) - layerInfluenceRect.origin.x);

automate-sketch.sketchplugin/Contents/Sketch/Export/Quick_Export.js

@@ -129,11 +129,20 @@ var onRun = function(context) {
 };
 
 function exportLayer(document, layer, destFolder, nameFormat, preset) {
+    var sketch = require("sketch");
+    var version = sketch.version.sketch;
     preset.exportFormats().forEach(function(exportFormat) {
+        var absoluteInfluenceRect;
+        if (version >= 96) {
+            var relativeInfluenceRect = layer.immutableModelObject().influenceRectForBoundsInDocument(layer.documentData());
+            absoluteInfluenceRect = layer.convertRect_toLayer(relativeInfluenceRect, null);
+        } else {
+            absoluteInfluenceRect = layer.absoluteInfluenceRect();
+        }
         var exportRequest = MSExportRequest.exportRequestFromLayerAncestry_exportFormat_inRect(
             layer.ancestry(),
             exportFormat,
-            layer.absoluteInfluenceRect()
+            absoluteInfluenceRect
         );
         var filePath = "";
         if (nameFormat == 1) {

automate-sketch.sketchplugin/Contents/Sketch/Layer/Bounds_Layer_for_Every_Selection.js

@@ -79,7 +79,7 @@ var onRun = function(context) {
                     boundsLayerHeight = userCustomHeight;
                 }
 
-                if (layer.class() == "MSLayerGroup" || layer.class() == "MSArtboardGroup") {
+                if (layer.class() == "MSLayerGroup" || layer.class() == "MSArtboardGroup" || layer.class() == "MSSymbolMaster") {
                     parent = layer;
                     beforeLayer = layer.firstLayer();
                     boundsLayerX = 0 - layer.frame().x() + Math.floor(layer.frame().x()) - boundsOffsetLeft;
@@ -111,7 +111,7 @@ var onRun = function(context) {
                 }
 
                 // Artboard
-                if (layer.class() == "MSArtboardGroup") {
+                if (layer.class() == "MSArtboardGroup" || layer.class() == "MSSymbolMaster") {
                     layer.frame().setX(layer.frame().x() - boundsOffsetLeft);
                     layer.frame().setY(layer.frame().y() - boundsOffsetTop);
                     layer.frame().setWidth(boundsLayerWidth);

automate-sketch.sketchplugin/Contents/Sketch/Symbol/Set_to_Original_Width_or_Height.js

@@ -21,7 +21,6 @@ var onRun = function(context) {
             var symbolMaster = layer.symbolMaster();
             var originalWidth = symbolMaster.frame().width();
             var originalHeight = symbolMaster.frame().height();
-
             layer.frame().setConstrainProportions(false);
 
             if (pluginIdentifier == "set_to_original_width" || pluginIdentifier == "set_to_original_size") {

automate-sketch.sketchplugin/Contents/Sketch/manifest.json

@@ -5,7 +5,7 @@
   "email": "Ashung.hung@gmail.com",
   "homepage": "https://github.com/Ashung/Automate-Sketch",
   "appcast": "https://ashung.github.io/Automate-Sketch/appcast.xml",
-  "version": "93.0.20220921",
+  "version": "96.3.20230530",
   "identifier": "com.ashung.hung.automate_sketch",
   "icon": "icon.png",
   "suppliesData": true,
@@ -307,7 +307,7 @@
       "icon": "icon_runner.png"
     },
     {
-      "name": "Artboard from Selection",
+      "name": "Artboards from Selection",
       "identifier": "artboard_from_selection",
       "script": "Artboard/Artboard_from_Selection.js",
       "icon": "icon_runner.png"

automate-sketch.sketchplugin/Contents/Sketch/modules/Pasteboard.js

@@ -1,3 +1,5 @@
+var sketch = require("sketch");
+var version = sketch.version.sketch;
 var pasteboard = NSPasteboard.generalPasteboard();
 
 module.exports.copy = function(text) {
@@ -6,12 +8,14 @@ module.exports.copy = function(text) {
 };
 
 module.exports.getPasteboardLayers = function() {
-    var sketch = require("sketch");
     var document = sketch.getSelectedDocument();
-    var version = sketch.version.sketch;
     var pasteboardManager = NSApp.delegate().pasteboardManager();
     var pasteboardLayers;
-    if (version >= 74) {
+    if (version >= 96) {
+        pasteboardLayers = pasteboardManager.readPasteboardLayersFromPasteboard_document_options(
+            pasteboard, nil, nil
+        );
+    } else if (version >= 74) {
         pasteboardLayers = pasteboardManager.readPasteboardLayersFromPasteboard_document_options(
             pasteboard, document.sketchObject, nil
         );
@@ -30,7 +34,11 @@ module.exports.getPasteboardLayers = function() {
 }
 
 module.exports.getLayers = function() {
-    return this.getPasteboardLayers().layers().layers();
+    if (version >= 96) {
+        return this.getPasteboardLayers().layers();
+    } else {
+        return this.getPasteboardLayers().layers().layers();
+    }
 };
 
 module.exports.setImage = function(nsData) {

automate-sketch.sketchplugin/Contents/Sketch/modules/Preview.js

@@ -7,7 +7,7 @@ var version = sketch.version.sketch;
  * @return  {NSImage}
  */
 module.exports.symbol = function(symbolMaster, size) {
-    size = size || Math.max(symbolMaster.frame().width(), symbolMaster.frame().height());
+    // size = size || Math.max(symbolMaster.frame().width(), symbolMaster.frame().height());
     return artboardPreviewGenerator(symbolMaster, size, size, false);
 };
 
@@ -159,16 +159,21 @@ function artboardPreviewGenerator(artboard, width, height, remove) {
         document.selectedPage.sketchObject.addLayer(artboard);
     }
     var exportRequest = MSExportRequest.exportRequestsFromLayerAncestry(artboard.ancestry()).firstObject();
-    var scale = Math.min(width / artboard.frame().width(), height / artboard.frame().height());
-    exportRequest.setScale(scale * 2);
+    // var scale = Math.min(width / artboard.frame().width(), height / artboard.frame().height());
+    // exportRequest.setScale(scale * 2);
     var colorSpace;
     if (version >= 86) {
         colorSpace = document.sketchObject.colorSpace().CGColorSpace();
     } else {
         colorSpace = document.sketchObject.colorSpace();
     }
     var exporter = MSExporter.exporterForRequest_colorSpace(exportRequest, colorSpace);
-    var image = exporter.image();
+    var image;
+    if (version >= 96) {
+        image = NSImage.alloc().initWithData(exporter.data());
+    } else {
+        image = exporter.image();
+    }
     if (remove) {
         artboard.removeFromParent();
     }