From cbf2d6b4eaa5febc5cf7da02724fc098829a28e4 Mon Sep 17 00:00:00 2001
From: Unity Technologies <@unity>
Date: Thu, 14 Dec 2023 00:00:00 +0000
Subject: [PATCH] com.unity.2d.animation@9.1.0 ## [9.1.0] - 2023-12-14 ###
 Fixed - Blend weight vertex attribute is added only when sprite has bones.
 (case DANB-520) - Sprite Library editor drag and drop interactions. (case
 DANB-535) - Sprite Library editor drag and drop blocked by labels. (case
 DANB-558) - Adjust the copy-paste logic to not paste sprite mesh to the same
 sprite twice. (case DANB-530) - Sprite Library Asset is selected on creation.
 (case DANB-542) - Sprite Resolver previews not visible after editor regained
 focus. (case DANB-564)

### Added
- SpriteSkin's Auto Rebind property can now be accessed from scripts. (case DANB-490)
- Sprite Library public API to save an asset as a .spriteLib SpriteLibrarySourceAsset.
---
 CHANGELOG.md                                  |  13 +
 .../SpriteLibraryEditor/CategoriesTab.uxml    |   4 +-
 .../SpriteLibraryEditor/EditorTabHeader.uxml  |   4 +-
 .../Assets/SpriteLibraryEditor/LabelsTab.uxml |   2 +-
 .../SpriteLibraryEditorWindow.uxml            |   2 +-
 Editor/SkinningModule/CopyTool.cs             |   6 +-
 .../SpriteLibraryEditor/DragAndDropData.cs    |  19 ++
 ...andler.cs.meta => DragAndDropData.cs.meta} |   0
 .../SpriteLibraryEditor/DragAndDropHandler.cs | 256 ---------------
 .../DragAndDropManipulator.cs                 | 217 ++++++++++++
 .../DragAndDropManipulator.cs.meta            |   3 +
 .../SpriteLibraryEditor/UI/CategoriesTab.cs   |  42 ++-
 .../UI/CustomElements/GridView.cs             |   2 +
 .../UI/CustomElements/RenamableCollections.cs |  17 +-
 .../SpriteLibraryEditor/UI/LabelsTab.cs       |  49 ++-
 .../SpriteLibraryEditor/WindowController.cs   |   2 +-
 ...riteLibrarySourceAssetImporterInspector.cs |   2 +
 .../SpriteLibrarySourceAssetFactory.cs        | 309 ++++++++++++++++++
 .../SpriteLibrarySourceAssetFactory.cs.meta   |   3 +
 Editor/SpriteLib/SpriteResolverInspector.cs   |  43 ++-
 Editor/SpritePostProcess.cs                   |  23 +-
 LICENSE.md                                    |   2 +-
 Runtime/SpriteLib/ISpriteLibraryCategory.cs   |  20 ++
 .../SpriteLib/ISpriteLibraryCategory.cs.meta  |   3 +
 Runtime/SpriteLib/ISpriteLibraryLabel.cs      |  18 +
 Runtime/SpriteLib/ISpriteLibraryLabel.cs.meta |   3 +
 Runtime/SpriteLib/SpriteLibraryAsset.cs       |   6 +-
 Runtime/SpriteSkin.cs                         |   6 +-
 package.json                                  |  18 +-
 29 files changed, 746 insertions(+), 348 deletions(-)
 create mode 100644 Editor/SpriteLib/SpriteLibraryEditor/DragAndDropData.cs
 rename Editor/SpriteLib/SpriteLibraryEditor/{DragAndDropHandler.cs.meta => DragAndDropData.cs.meta} (100%)
 delete mode 100644 Editor/SpriteLib/SpriteLibraryEditor/DragAndDropHandler.cs
 create mode 100644 Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs
 create mode 100644 Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs.meta
 create mode 100644 Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs
 create mode 100644 Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs.meta
 create mode 100644 Runtime/SpriteLib/ISpriteLibraryCategory.cs
 create mode 100644 Runtime/SpriteLib/ISpriteLibraryCategory.cs.meta
 create mode 100644 Runtime/SpriteLib/ISpriteLibraryLabel.cs
 create mode 100644 Runtime/SpriteLib/ISpriteLibraryLabel.cs.meta

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34a236bd..ea083356 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [9.1.0] - 2023-12-14
+### Fixed
+- Blend weight vertex attribute is added only when sprite has bones. (case DANB-520)
+- Sprite Library editor drag and drop interactions. (case DANB-535)
+- Sprite Library editor drag and drop blocked by labels. (case DANB-558)
+- Adjust the copy-paste logic to not paste sprite mesh to the same sprite twice. (case DANB-530)
+- Sprite Library Asset is selected on creation. (case DANB-542)
+- Sprite Resolver previews not visible after editor regained focus. (case DANB-564)
+
+### Added
+- SpriteSkin's Auto Rebind property can now be accessed from scripts. (case DANB-490)
+- Sprite Library public API to save an asset as a .spriteLib SpriteLibrarySourceAsset.
+
 ## [9.0.4] - 2023-09-05
 ### Fixed
 - Fixed an issue where the FK doesn't blend correctly with the IK if solver solves from the bind pose. (case DANB-482)
diff --git a/Editor/Assets/SpriteLibraryEditor/CategoriesTab.uxml b/Editor/Assets/SpriteLibraryEditor/CategoriesTab.uxml
index bf537da9..5eb02de3 100644
--- a/Editor/Assets/SpriteLibraryEditor/CategoriesTab.uxml
+++ b/Editor/Assets/SpriteLibraryEditor/CategoriesTab.uxml
@@ -1,8 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" eui="UnityEditor.UIElements" aui="UnityEditor.U2D.Animation.SpriteLibraryEditor">
     <UnityEditor.U2D.Animation.SpriteLibraryEditor.CategoriesTab name="CategoriesTab">
-        <Style src="CategoriesTab.uss"/>
+        <Style src="CategoriesTab.uss" />
         <ui:Template name="EditorTabHeader" src="EditorTabHeader.uxml" />
-        <ui:Instance template="EditorTabHeader" name="EditorTabHeader"/>
+        <ui:Instance template="EditorTabHeader" name="EditorTabHeader" pickingMode="Ignore" />
         <ui:ScrollView name="CategoryListsScrollView">
         </ui:ScrollView>
     </UnityEditor.U2D.Animation.SpriteLibraryEditor.CategoriesTab>
diff --git a/Editor/Assets/SpriteLibraryEditor/EditorTabHeader.uxml b/Editor/Assets/SpriteLibraryEditor/EditorTabHeader.uxml
index 5bd6604f..2c4e186b 100644
--- a/Editor/Assets/SpriteLibraryEditor/EditorTabHeader.uxml
+++ b/Editor/Assets/SpriteLibraryEditor/EditorTabHeader.uxml
@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" eui="UnityEditor.UIElements" aui="UnityEditor.U2D.Animation.SpriteLibraryEditor">
-    <UnityEditor.U2D.Animation.SpriteLibraryEditor.EditorTabHeader name="EditorTabHeader">
-        <ui:VisualElement name="TopBar" class="sprite-library-editor-window__top-bar">
+    <UnityEditor.U2D.Animation.SpriteLibraryEditor.EditorTabHeader name="EditorTabHeader" pickingMode="Ignore" >
+        <ui:VisualElement name="TopBar" class="sprite-library-editor-window__top-bar" pickingMode="Ignore" >
             <ui:Button name="AddButton" class="sprite-library-editor-window__add-button"/>
             <ui:Label text="Label"/>
         </ui:VisualElement>
diff --git a/Editor/Assets/SpriteLibraryEditor/LabelsTab.uxml b/Editor/Assets/SpriteLibraryEditor/LabelsTab.uxml
index 2829df97..f7eee533 100644
--- a/Editor/Assets/SpriteLibraryEditor/LabelsTab.uxml
+++ b/Editor/Assets/SpriteLibraryEditor/LabelsTab.uxml
@@ -2,7 +2,7 @@
     <UnityEditor.U2D.Animation.SpriteLibraryEditor.LabelsTab name="LabelsTab">
         <Style src="LabelsTab.uss"/>
         <ui:Template name="EditorTabHeader" src="EditorTabHeader.uxml" />
-        <ui:Instance template="EditorTabHeader" name="EditorTabHeader" />
+        <ui:Instance template="EditorTabHeader" name="EditorTabHeader" pickingMode="Ignore" />
         <ui:VisualElement name="LabelsContainer" />
     </UnityEditor.U2D.Animation.SpriteLibraryEditor.LabelsTab>
 </ui:UXML>
diff --git a/Editor/Assets/SpriteLibraryEditor/SpriteLibraryEditorWindow.uxml b/Editor/Assets/SpriteLibraryEditor/SpriteLibraryEditorWindow.uxml
index d56ba30f..2425a73c 100644
--- a/Editor/Assets/SpriteLibraryEditor/SpriteLibraryEditorWindow.uxml
+++ b/Editor/Assets/SpriteLibraryEditor/SpriteLibraryEditorWindow.uxml
@@ -4,7 +4,7 @@
     <ui:Template name="EditorMainWindow" src="EditorMainWindow.uxml" />
     <ui:Template name="EditorBottomToolbar" src="EditorBottomToolbar.uxml" />
     <ui:VisualElement name="EditorWindowRoot" >
-        <ui:Instance template="EditorTopToolbar" name="EditorTopToolbar" />
+        <ui:Instance template="EditorTopToolbar" name="EditorTopToolbar" pickingMode="Ignore" />
         <ui:Instance template="EditorMainWindow" name="EditorMainWindow" />
         <ui:Instance template="EditorBottomToolbar" name="EditorBottomToolbar" />
     </ui:VisualElement>
diff --git a/Editor/SkinningModule/CopyTool.cs b/Editor/SkinningModule/CopyTool.cs
index 098ef6db..acaa8b06 100644
--- a/Editor/SkinningModule/CopyTool.cs
+++ b/Editor/SkinningModule/CopyTool.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEditor.U2D.Common;
 using UnityEditor.U2D.Layout;
@@ -317,17 +318,20 @@ public void OnPasteActivated(bool shouldPasteBones, bool shouldPasteMesh, bool s
                         pastedBonesToSelect.Add(newBone);
                 }
 
+                var pastedToSprites = new List<SpriteCache>();
                 foreach (var copySpriteData in skinningCopyData.copyData)
                 {
                     SpriteCache sprite = null;
                     if (selectedSprite != null && !doesCopyContainMultipleSprites)
                         sprite = selectedSprite;
                     if (sprite == null && !string.IsNullOrEmpty(copySpriteData.spriteName))
-                        sprite = FindSpriteWithName(sprites, copySpriteData.spriteName);
+                        sprite = FindSpriteWithName(sprites.Except(pastedToSprites).ToList(), copySpriteData.spriteName) ?? FindSpriteWithName(sprites, copySpriteData.spriteName);
 
                     if (sprite == null)
                         continue;
 
+                    pastedToSprites.Add(sprite);
+
                     var boneMapping = new Dictionary<string, string>();
                     if (shouldPasteBones && !replaceCharacterSkeleton)
                     {
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropData.cs b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropData.cs
new file mode 100644
index 00000000..486fb71c
--- /dev/null
+++ b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropData.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UnityEditor.U2D.Animation.SpriteLibraryEditor
+{
+    internal enum SpriteSourceType
+    {
+        Sprite,
+        Psb
+    }
+
+    internal struct DragAndDropData
+    {
+        public SpriteSourceType spriteSourceType;
+        public string name;
+        public List<Sprite> sprites;
+    }
+}
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropHandler.cs.meta b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropData.cs.meta
similarity index 100%
rename from Editor/SpriteLib/SpriteLibraryEditor/DragAndDropHandler.cs.meta
rename to Editor/SpriteLib/SpriteLibraryEditor/DragAndDropData.cs.meta
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropHandler.cs b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropHandler.cs
deleted file mode 100644
index 345d637a..00000000
--- a/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropHandler.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using UnityEngine;
-using UnityEngine.UIElements;
-using Object = UnityEngine.Object;
-
-namespace UnityEditor.U2D.Animation.SpriteLibraryEditor
-{
-    internal enum SpriteSourceType
-    {
-        Sprite,
-        Psb
-    }
-
-    internal struct DragAndDropData
-    {
-        public SpriteSourceType spriteSourceType;
-        public string name;
-        public List<Sprite> sprites;
-    }
-
-    internal static class DragAndDropHandler
-    {
-        public const string overlayElementName = "DragAndDropOverlay";
-        const string k_DragOverAddClassName = SpriteLibraryEditorWindow.editorWindowClassName + "__drag-over-add";
-        static readonly List<string> k_SupportedPsdExtensions = new() { ".psd", ".psb" };
-
-        class DragDataReceiverTracker
-        {
-            public VisualElement activeElement { get; private set; }
-            public bool Contains(VisualElement e) => receivingElements.Contains(e);
-            List<VisualElement> receivingElements { get; } = new();
-
-            public void AddNewElement(VisualElement receivingElement, DragAndDropVisualMode visualMode)
-            {
-                var lastReceivingElement = receivingElements.Count == 0 ? null : receivingElements[^1];
-                lastReceivingElement?.RemoveFromClassList(k_DragOverAddClassName);
-
-                receivingElements.Add(receivingElement);
-
-                activeElement = receivingElement;
-
-                if (visualMode == DragAndDropVisualMode.Copy)
-                    receivingElement.AddToClassList(k_DragOverAddClassName);
-            }
-
-            public bool RemoveElement(VisualElement receivingElement)
-            {
-                receivingElements.Remove(receivingElement);
-
-                var lastReceivingElement = receivingElements.Count == 0 ? null : receivingElements[^1];
-                if (receivingElement.ClassListContains(k_DragOverAddClassName))
-                {
-                    receivingElement.RemoveFromClassList(k_DragOverAddClassName);
-                    lastReceivingElement?.AddToClassList(k_DragOverAddClassName);
-                }
-
-                activeElement = lastReceivingElement;
-
-                return receivingElements.Count == 0;
-            }
-
-            public void Clear()
-            {
-                foreach (var receivingElement in receivingElements)
-                {
-                    if (receivingElement.ClassListContains(k_DragOverAddClassName))
-                        receivingElement.RemoveFromClassList(k_DragOverAddClassName);
-                }
-
-                receivingElements.Clear();
-            }
-        }
-
-        static DragAndDropVisualMode DecideVisualMode()
-        {
-            foreach (var objectReference in DragAndDrop.objectReferences)
-            {
-                if (objectReference is Sprite or Texture2D)
-                    return DragAndDropVisualMode.Copy;
-            }
-
-            foreach (var path in DragAndDrop.paths)
-            {
-                var ext = Path.GetExtension(path).ToLower();
-                if (k_SupportedPsdExtensions.Contains(ext))
-                    return DragAndDropVisualMode.Copy;
-            }
-
-            return DragAndDropVisualMode.Rejected;
-        }
-
-        static List<DragAndDropData> RetrieveDraggedSprites(Object[] objectReferences)
-        {
-            var data = new List<DragAndDropData>();
-            var unassociatedSprites = new List<Sprite>();
-            foreach (var objectReference in objectReferences)
-            {
-                switch (objectReference)
-                {
-                    case Sprite sprite:
-                        unassociatedSprites.Add(sprite);
-                        break;
-                    case Texture2D texture2D:
-                    {
-                        var texturePath = AssetDatabase.GetAssetPath(texture2D);
-                        var spritesFromTexture = new List<Sprite>();
-                        foreach (var obj in AssetDatabase.LoadAllAssetsAtPath(texturePath))
-                        {
-                            if (obj is Sprite)
-                                spritesFromTexture.Add((Sprite)obj);
-                        }
-
-                        var textureData = new DragAndDropData
-                        {
-                            name = Path.GetFileNameWithoutExtension(texturePath),
-                            sprites = new List<Sprite>(spritesFromTexture),
-                            spriteSourceType = SpriteSourceType.Sprite
-                        };
-
-                        data.Add(textureData);
-                        break;
-                    }
-                    case GameObject gameObject:
-                    {
-                        var isPsdGameObjectRoot = gameObject.transform.parent != null;
-                        if (isPsdGameObjectRoot)
-                            continue;
-
-                        var psdFilePath = AssetDatabase.GetAssetPath(gameObject);
-                        if (string.IsNullOrEmpty(psdFilePath))
-                            continue;
-
-                        var ext = Path.GetExtension(psdFilePath);
-                        if (k_SupportedPsdExtensions.Contains(ext))
-                        {
-                            var psdSprites = new List<Sprite>();
-                            foreach (var obj in AssetDatabase.LoadAllAssetsAtPath(psdFilePath))
-                            {
-                                var spriteObj = obj as Sprite;
-                                if (spriteObj != null)
-                                    psdSprites.Add(spriteObj);
-                            }
-
-                            var psdData = new DragAndDropData
-                            {
-                                name = Path.GetFileNameWithoutExtension(psdFilePath),
-                                sprites = new List<Sprite>(psdSprites),
-                                spriteSourceType = SpriteSourceType.Psb
-                            };
-
-                            data.Add(psdData);
-                        }
-
-                        break;
-                    }
-                }
-            }
-
-            if (unassociatedSprites.Count > 0)
-            {
-                var spritesData = new DragAndDropData
-                {
-                    name = unassociatedSprites[0].name,
-                    sprites = unassociatedSprites,
-                    spriteSourceType = SpriteSourceType.Sprite
-                };
-                data.Add(spritesData);
-            }
-
-            return data;
-        }
-
-        public static void SetupDragOverlay(
-            VisualElement visualElement, VisualElement overlay,
-            string dataKey,
-            Func<bool> canStartDrag,
-            Action<List<DragAndDropData>, bool> onDragPerform)
-        {
-            visualElement.RegisterCallback<DragEnterEvent>(evt => OnDragEnter(evt, overlay, dataKey, canStartDrag));
-            visualElement.RegisterCallback<DragUpdatedEvent>(evt => OnDragUpdate(evt, overlay, dataKey));
-            visualElement.RegisterCallback<DragExitedEvent>(evt => OnDragExit(evt, overlay, dataKey));
-            visualElement.RegisterCallback<DragLeaveEvent>(evt => OnDragLeave(evt, overlay, dataKey));
-            visualElement.RegisterCallback<DragPerformEvent>(evt => OnDragPerform(evt, overlay, dataKey, onDragPerform));
-        }
-
-        static void OnDragEnter(DragEnterEvent evt, VisualElement receivingElement, string dataKey, Func<bool> canStartDrag)
-        {
-            // Early out when list is reordered
-            if (DragAndDrop.GetGenericData("user_data") != null)
-                return;
-
-            if (!canStartDrag())
-                return;
-
-            var visualMode = DecideVisualMode();
-            var dragData = DragAndDrop.GetGenericData(dataKey) as DragDataReceiverTracker ?? new DragDataReceiverTracker();
-            dragData.AddNewElement(receivingElement, visualMode);
-            DragAndDrop.SetGenericData(dataKey, dragData);
-
-            evt.StopPropagation();
-        }
-
-        static void OnDragUpdate(DragUpdatedEvent evt, VisualElement receivingElement, string dataKey)
-        {
-            if (DragAndDrop.GetGenericData(dataKey) is DragDataReceiverTracker tracker
-                && tracker.Contains(receivingElement))
-            {
-                DragAndDrop.visualMode = DecideVisualMode();
-
-                evt.StopPropagation();
-            }
-        }
-
-        static void OnDragExit(DragExitedEvent evt, VisualElement receivingElement, string dataKey)
-        {
-            if (DragAndDrop.GetGenericData(dataKey) is DragDataReceiverTracker tracker
-                && tracker.Contains(receivingElement))
-            {
-                if (tracker.RemoveElement(receivingElement))
-                    DragAndDrop.SetGenericData(dataKey, null);
-
-                evt.StopPropagation();
-            }
-        }
-
-        static void OnDragLeave(DragLeaveEvent evt, VisualElement receivingElement, string dataKey)
-        {
-            if (DragAndDrop.GetGenericData(dataKey) is DragDataReceiverTracker tracker
-                && tracker.Contains(receivingElement))
-            {
-                if (tracker.RemoveElement(receivingElement))
-                    DragAndDrop.SetGenericData(dataKey, null);
-
-                evt.StopPropagation();
-            }
-        }
-
-        static void OnDragPerform(DragPerformEvent evt, VisualElement receivingElement, string dataKey, Action<List<DragAndDropData>, bool> onDragPerform)
-        {
-            if (DragAndDrop.GetGenericData(dataKey) is DragDataReceiverTracker tracker && tracker.activeElement == receivingElement)
-            {
-                tracker.Clear();
-                DragAndDrop.SetGenericData(dataKey, null);
-
-                var spritesData = RetrieveDraggedSprites(DragAndDrop.objectReferences);
-                if (spritesData.Count == 0)
-                    return;
-
-                onDragPerform?.Invoke(spritesData, evt.altKey);
-                evt.StopPropagation();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs
new file mode 100644
index 00000000..a481219d
--- /dev/null
+++ b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs
@@ -0,0 +1,217 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace UnityEditor.U2D.Animation.SpriteLibraryEditor
+{
+    internal class DragAndDropManipulator : Manipulator
+    {
+        public const string overlayClassName = "DragAndDropOverlay";
+        const string k_DragReceiverClassName = "DragReceiver";
+
+        event Action<IList<DragAndDropData>, bool> onDragPerform;
+        VisualElement m_OverlayVisual;
+        Func<bool> m_CanStartDrag;
+
+        const string k_DragOverAddClassName = SpriteLibraryEditorWindow.editorWindowClassName + "__drag-over-add";
+        static readonly List<string> k_SupportedPsdExtensions = new() { ".psd", ".psb" };
+        bool m_IsDragging;
+        bool m_IsChildDragged;
+
+        bool isActiveDrag => m_IsDragging && !m_IsChildDragged;
+
+        public DragAndDropManipulator(VisualElement overlayVisual, Func<bool> canDragStart, Action<IList<DragAndDropData>, bool> dragPerform)
+        {
+            m_OverlayVisual = overlayVisual;
+
+            m_OverlayVisual.AddToClassList(overlayClassName);
+
+            m_CanStartDrag = canDragStart;
+            onDragPerform = dragPerform;
+        }
+
+        protected override void RegisterCallbacksOnTarget()
+        {
+            target.AddToClassList(k_DragReceiverClassName);
+
+            target.RegisterCallback<DragEnterEvent>(OnDragEnter);
+            target.RegisterCallback<DragUpdatedEvent>(OnDragUpdate, TrickleDown.TrickleDown);
+            target.RegisterCallback<DragExitedEvent>(OnDragExit, TrickleDown.TrickleDown);
+            target.RegisterCallback<DragLeaveEvent>(OnDragLeave);
+            target.RegisterCallback<DragPerformEvent>(OnDragPerform);
+        }
+
+        protected override void UnregisterCallbacksFromTarget()
+        {
+            target.RemoveFromClassList(k_DragReceiverClassName);
+
+            target.UnregisterCallback<DragEnterEvent>(OnDragEnter);
+            target.UnregisterCallback<DragUpdatedEvent>(OnDragUpdate);
+            target.UnregisterCallback<DragExitedEvent>(OnDragExit);
+            target.UnregisterCallback<DragLeaveEvent>(OnDragLeave);
+            target.UnregisterCallback<DragPerformEvent>(OnDragPerform);
+        }
+
+        void OnDragEnter(DragEnterEvent evt)
+        {
+            if (evt.currentTarget == evt.target)
+                TryStartDrag();
+        }
+
+        void TryStartDrag()
+        {
+            if (m_IsDragging)
+                return;
+
+            // Early out when list is reordered
+            if (DragAndDrop.GetGenericData("user_data") != null)
+                return;
+
+            var spritesData = RetrieveDraggedSprites(DragAndDrop.objectReferences);
+            if (spritesData.Count == 0)
+                return;
+
+            if (!m_CanStartDrag())
+                return;
+
+            m_IsDragging = true;
+
+            UpdateVisuals();
+        }
+
+        void StopDragging()
+        {
+            if (!m_IsDragging)
+                return;
+
+            m_IsDragging = false;
+
+            UpdateVisuals();
+        }
+
+        void OnDragUpdate(DragUpdatedEvent evt)
+        {
+            m_IsChildDragged = evt.currentTarget != evt.target;
+
+            if (isActiveDrag)
+                DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
+
+            UpdateVisuals();
+            if (isActiveDrag)
+                evt.StopImmediatePropagation();
+        }
+
+        void OnDragExit(DragExitedEvent evt)
+        {
+            StopDragging();
+        }
+
+        void OnDragLeave(DragLeaveEvent evt)
+        {
+            StopDragging();
+        }
+
+        void UpdateVisuals()
+        {
+            m_OverlayVisual.EnableInClassList(k_DragOverAddClassName, isActiveDrag);
+        }
+
+        void OnDragPerform(DragPerformEvent evt)
+        {
+            if (!isActiveDrag)
+                return;
+
+            StopDragging();
+
+            var spritesData = RetrieveDraggedSprites(DragAndDrop.objectReferences);
+            if (spritesData.Count == 0)
+                return;
+
+            onDragPerform?.Invoke(spritesData, evt.altKey);
+        }
+
+        static List<DragAndDropData> RetrieveDraggedSprites(Object[] objectReferences)
+        {
+            var data = new List<DragAndDropData>();
+            var unassociatedSprites = new List<Sprite>();
+            foreach (var objectReference in objectReferences)
+            {
+                switch (objectReference)
+                {
+                    case Sprite sprite:
+                        unassociatedSprites.Add(sprite);
+                        break;
+                    case Texture2D texture2D:
+                    {
+                        var texturePath = AssetDatabase.GetAssetPath(texture2D);
+                        var spritesFromTexture = new List<Sprite>();
+                        foreach (var obj in AssetDatabase.LoadAllAssetsAtPath(texturePath))
+                        {
+                            if (obj is Sprite)
+                                spritesFromTexture.Add((Sprite)obj);
+                        }
+
+                        var textureData = new DragAndDropData
+                        {
+                            name = Path.GetFileNameWithoutExtension(texturePath),
+                            sprites = new List<Sprite>(spritesFromTexture),
+                            spriteSourceType = SpriteSourceType.Sprite
+                        };
+
+                        data.Add(textureData);
+                        break;
+                    }
+                    case GameObject gameObject:
+                    {
+                        var isPsdGameObjectRoot = gameObject.transform.parent != null;
+                        if (isPsdGameObjectRoot)
+                            continue;
+
+                        var psdFilePath = AssetDatabase.GetAssetPath(gameObject);
+                        if (string.IsNullOrEmpty(psdFilePath))
+                            continue;
+
+                        var ext = Path.GetExtension(psdFilePath);
+                        if (k_SupportedPsdExtensions.Contains(ext))
+                        {
+                            var psdSprites = new List<Sprite>();
+                            foreach (var obj in AssetDatabase.LoadAllAssetsAtPath(psdFilePath))
+                            {
+                                var spriteObj = obj as Sprite;
+                                if (spriteObj != null)
+                                    psdSprites.Add(spriteObj);
+                            }
+
+                            var psdData = new DragAndDropData
+                            {
+                                name = Path.GetFileNameWithoutExtension(psdFilePath),
+                                sprites = new List<Sprite>(psdSprites),
+                                spriteSourceType = SpriteSourceType.Psb
+                            };
+
+                            data.Add(psdData);
+                        }
+
+                        break;
+                    }
+                }
+            }
+
+            if (unassociatedSprites.Count > 0)
+            {
+                var spritesData = new DragAndDropData
+                {
+                    name = unassociatedSprites[0].name,
+                    sprites = unassociatedSprites,
+                    spriteSourceType = SpriteSourceType.Sprite
+                };
+                data.Add(spritesData);
+            }
+
+            return data;
+        }
+    }
+}
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs.meta b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs.meta
new file mode 100644
index 00000000..9669cadc
--- /dev/null
+++ b/Editor/SpriteLib/SpriteLibraryEditor/DragAndDropManipulator.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b9a291647c9840e9a0a6b791ff78545a
+timeCreated: 1697000022
\ No newline at end of file
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/UI/CategoriesTab.cs b/Editor/SpriteLib/SpriteLibraryEditor/UI/CategoriesTab.cs
index c902f390..92e1ab3d 100644
--- a/Editor/SpriteLib/SpriteLibraryEditor/UI/CategoriesTab.cs
+++ b/Editor/SpriteLib/SpriteLibraryEditor/UI/CategoriesTab.cs
@@ -35,8 +35,6 @@ public class CustomUxmlFactory : UxmlFactory<CategoriesTab, UxmlTraits> { }
         const string k_ListTextClassName = SpriteLibraryEditorWindow.editorWindowClassName + "__category-list-text";
         const string k_ListItemClassName = SpriteLibraryEditorWindow.editorWindowClassName + "__category-list-item";
 
-        const string k_CategoryDragItemsStr = "SpriteLibraryCategory.DragItems";
-
         const int k_FoldoutHeight = 25;
         const int k_ListItemHeight = 20;
 
@@ -55,22 +53,24 @@ public void BindElements(ControllerEvents controllerEvents, ViewEvents viewEvent
             tabHeaderLabel.text = "Categories";
             tabHeaderLabel.tooltip = TextContent.spriteLibraryCategoriesTooltip;
 
-            var containerOverlay = new VisualElement { name = DragAndDropHandler.overlayElementName, pickingMode = PickingMode.Ignore };
+            var containerOverlay = new VisualElement { pickingMode = PickingMode.Ignore };
             Add(containerOverlay);
             containerOverlay.StretchToParentSize();
 
             this.AddManipulator(new ContextualMenuManipulator(ContextualManipulatorAddActions));
 
-            DragAndDropHandler.SetupDragOverlay(this, containerOverlay, k_CategoryDragItemsStr, CanDragStart, (spritesData, alt) =>
+            this.AddManipulator(new DragAndDropManipulator(containerOverlay, CanDragStart, (spritesData, alt) =>
             {
                 m_ViewEvents.onAddDataToCategories?.Invoke(spritesData, alt, null);
-            });
+            }));
 
             controllerEvents.onModifiedCategories.AddListener(OnModifiedCategories);
             controllerEvents.onSelectedCategories.AddListener(SetSelection);
             controllerEvents.onSelectedLibrary.AddListener(OnLibraryAssetSelected);
 
             m_CategoryListsScrollContainer = this.Q<ScrollView>("CategoryListsScrollView");
+            m_CategoryListsScrollContainer.pickingMode = PickingMode.Ignore;
+            m_CategoryListsScrollContainer.Q<VisualElement>("unity-content-and-vertical-scroll-container").pickingMode = PickingMode.Ignore;
             m_CategoryListsContainer = new VisualElement { name = "CategoryListsContainer", pickingMode = PickingMode.Ignore };
             m_CategoryListsScrollContainer.Add(m_CategoryListsContainer);
 
@@ -136,7 +136,7 @@ void OnBindLocalItem(VisualElement e, int i)
                 text.RegisterCallback<FocusOutEvent>(OnTextFocusOut);
             }
 
-            var overlay = e.Q(DragAndDropHandler.overlayElementName);
+            var overlay = e.Q(className: DragAndDropManipulator.overlayClassName);
             overlay.userData = categoryName;
         }
 
@@ -150,9 +150,9 @@ VisualElement OnMakeLocalItem()
         {
             var e = new VisualElement { name = "LocalItemParent" };
 
-            var label = new Label { name = IRenamableCollection.labelElementName, style = { display = DisplayStyle.None } };
+            var label = new Label { name = IRenamableCollection.labelElementName, pickingMode = PickingMode.Ignore, style = { display = DisplayStyle.None } };
 
-            var overlay = new VisualElement { name = DragAndDropHandler.overlayElementName };
+            var overlay = new VisualElement { pickingMode = PickingMode.Ignore };
             e.Add(overlay);
             overlay.StretchToParentSize();
 
@@ -161,10 +161,10 @@ VisualElement OnMakeLocalItem()
 
             e.Add(label);
 
-            DragAndDropHandler.SetupDragOverlay(e, overlay, k_CategoryDragItemsStr, CanDragStart, (spritesData, alt) =>
+            e.AddManipulator(new DragAndDropManipulator(overlay, CanDragStart, (spritesData, alt) =>
             {
                 m_ViewEvents.onAddDataToCategories?.Invoke(spritesData, alt, overlay.userData.ToString());
-            });
+            }));
 
             return e;
         }
@@ -191,22 +191,22 @@ void SetupInheritedList()
 
         VisualElement OnMakeInheritedItem()
         {
-            var e = new VisualElement {name = "InheritedItemParent"};
+            var e = new VisualElement { name = "InheritedItemParent" };
 
-            var label = new Label();
+            var label = new Label() { pickingMode = PickingMode.Ignore };
             label.AddToClassList(k_ListTextClassName);
             e.AddToClassList(k_ListItemClassName);
 
-            var overlay = new VisualElement { name = DragAndDropHandler.overlayElementName };
+            var overlay = new VisualElement { name = DragAndDropManipulator.overlayClassName, pickingMode = PickingMode.Ignore };
             e.Add(overlay);
             overlay.StretchToParentSize();
 
             e.Add(label);
 
-            DragAndDropHandler.SetupDragOverlay(e, overlay, k_CategoryDragItemsStr, CanDragStart, (spritesData, alt) =>
+            e.AddManipulator(new DragAndDropManipulator(overlay, CanDragStart, (spritesData, alt) =>
             {
                 m_ViewEvents.onAddDataToCategories?.Invoke(spritesData, alt, overlay.userData.ToString());
-            });
+            }));
 
             return e;
         }
@@ -217,18 +217,15 @@ void OnBindInheritedItem(VisualElement e, int i)
             var category = m_InheritedCategoriesData[i];
             label.text = category.name;
 
-            if (category.isOverride)
-                e.AddToClassList(SpriteLibraryEditorWindow.overrideClassName);
-            else
-                e.RemoveFromClassList(SpriteLibraryEditorWindow.overrideClassName);
+            e.EnableInClassList(SpriteLibraryEditorWindow.overrideClassName, category.isOverride);
 
-            var overlay = e.Q(DragAndDropHandler.overlayElementName);
+            var overlay = e.Q(className: DragAndDropManipulator.overlayClassName);
             overlay.userData = category.name;
         }
 
         static void OnUnbindItem(VisualElement e, int i)
         {
-            var overlay = e.Q(DragAndDropHandler.overlayElementName);
+            var overlay = e.Q(className: DragAndDropManipulator.overlayClassName);
             overlay.userData = null;
 
             e.RemoveFromClassList(SpriteLibraryEditorWindow.overrideClassName);
@@ -263,7 +260,8 @@ void SetupUI()
             {
                 name = "InfoLabel",
                 text = TextContent.spriteCategoryColumnEmpty,
-                style = { display = DisplayStyle.None }
+                style = { display = DisplayStyle.None },
+                pickingMode = PickingMode.Ignore
             };
             m_InfoLabel.AddToClassList(SpriteLibraryEditorWindow.infoLabelClassName);
             Add(m_InfoLabel);
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/GridView.cs b/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/GridView.cs
index 040eb159..adea2dc3 100644
--- a/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/GridView.cs
+++ b/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/GridView.cs
@@ -813,6 +813,7 @@ void ClearSelectionWithoutValidation()
         VisualElement CreateDummyItemElement()
         {
             var item = new VisualElement();
+            item.pickingMode = PickingMode.Ignore;
             SetupItemElement(item);
             return item;
         }
@@ -1340,6 +1341,7 @@ internal class RecycledRow : VisualElement
             public RecycledRow(float height)
             {
                 AddToClassList(k_RowUssClassName);
+                pickingMode = PickingMode.Ignore;
                 style.height = height;
 
                 indices = new List<int>();
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/RenamableCollections.cs b/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/RenamableCollections.cs
index f8c1e856..2d6971df 100644
--- a/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/RenamableCollections.cs
+++ b/Editor/SpriteLib/SpriteLibraryEditor/UI/CustomElements/RenamableCollections.cs
@@ -46,6 +46,14 @@ public RenamableListView()
             name = "RenamableCollection";
             reorderable = false;
 
+            pickingMode = PickingMode.Ignore;
+
+            var scrollView = this.Q<ScrollView>();
+            scrollView.pickingMode = PickingMode.Ignore;
+            scrollView.contentContainer.pickingMode = PickingMode.Ignore;
+            scrollView.contentViewport.pickingMode = PickingMode.Ignore;
+            scrollView.contentViewport.parent.pickingMode = PickingMode.Ignore;
+
             itemsChosen += OnItemChosen;
 
             RegisterCallback<KeyDownEvent>(OnCollectionKeyDown);
@@ -155,6 +163,13 @@ public RenamableGridView()
 
             onItemsChosen += OnItemChosen;
 
+            pickingMode = PickingMode.Ignore;
+
+            scrollView.pickingMode = PickingMode.Ignore;
+            scrollView.contentContainer.pickingMode = PickingMode.Ignore;
+            scrollView.contentViewport.pickingMode = PickingMode.Ignore;
+            scrollView.contentViewport.parent.pickingMode = PickingMode.Ignore;
+
             scrollView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
             scrollView.verticalScrollerVisibility = ScrollerVisibility.Auto;
 
@@ -262,4 +277,4 @@ void UpdateColumnCount()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/UI/LabelsTab.cs b/Editor/SpriteLib/SpriteLibraryEditor/UI/LabelsTab.cs
index 80b30c3b..9fe289bb 100644
--- a/Editor/SpriteLib/SpriteLibraryEditor/UI/LabelsTab.cs
+++ b/Editor/SpriteLib/SpriteLibraryEditor/UI/LabelsTab.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using UnityEditor.UIElements;
 using UnityEngine;
-using UnityEngine.U2D.Animation;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.U2D.Animation.SpriteLibraryEditor
@@ -17,19 +16,17 @@ public class CustomUxmlFactory : UxmlFactory<LabelsTab, UxmlTraits> { }
         VisualElement m_LabelsContainer;
         Button m_AddButton;
         Label m_InfoLabel;
-        
+
         IRenamableCollection m_ItemsCollection;
         List<string> m_SelectedCategories = new();
         List<string> m_SelectedLabels = new();
-        
+
         List<LabelData> m_LabelData = new();
 
         ViewType m_CurrentViewType;
         float m_CurrentViewSize;
         float m_AdjustedViewSize;
 
-        const string k_LabelDragItemsStr = "SpriteLibraryLabel.DragItems";
-
         const string k_ListLabelClassName = SpriteLibraryEditorWindow.editorWindowClassName + "__label-list-label";
         const string k_GridLabelClassName = SpriteLibraryEditorWindow.editorWindowClassName + "__label-grid-label";
         const string k_ListTextClassName = SpriteLibraryEditorWindow.editorWindowClassName + "__label-list-text";
@@ -54,21 +51,22 @@ public void BindElements(ControllerEvents controllerEvents, ViewEvents viewEvent
             m_CurrentViewSize = SpriteLibraryEditorWindow.Settings.viewSize;
 
             m_LabelsContainer = this.Q<VisualElement>("LabelsContainer");
+            m_LabelsContainer.pickingMode = PickingMode.Ignore;
 
             var tabHeaderLabel = this.Q(SpriteLibraryEditorWindow.tabHeaderName).Q<Label>();
             tabHeaderLabel.text = "Labels";
             tabHeaderLabel.tooltip = TextContent.spriteLibraryLabelsTooltip;
 
-            var container = new VisualElement { name = DragAndDropHandler.overlayElementName, pickingMode = PickingMode.Ignore };
+            var container = new VisualElement { pickingMode = PickingMode.Ignore };
             Add(container);
             container.StretchToParentSize();
 
             this.AddManipulator(new ContextualMenuManipulator(ContextualManipulatorAddActions));
 
-            DragAndDropHandler.SetupDragOverlay(this, container, k_LabelDragItemsStr, IsTabActive, (spritesData, alt) =>
+            this.AddManipulator(new DragAndDropManipulator(container, IsTabActive, (spritesData, alt) =>
             {
                 m_ViewEvents.onAddDataToLabels?.Invoke(spritesData, alt, null);
-            });
+            }));
 
             controllerEvents.onModifiedLabels.AddListener(OnModifiedLabels);
             controllerEvents.onSelectedCategories.AddListener(OnSelectedCategories);
@@ -133,7 +131,8 @@ void SetupUI()
             {
                 name = "InfoLabel",
                 text = TextContent.spriteCategoryNoSelection,
-                style = { display = DisplayStyle.None }
+                style = { display = DisplayStyle.None },
+                pickingMode = PickingMode.Ignore
             };
             m_InfoLabel.AddToClassList(SpriteLibraryEditorWindow.infoLabelClassName);
             m_LabelsContainer.Add(m_InfoLabel);
@@ -209,7 +208,7 @@ void SetViewType(ViewType newView)
 
         static void UnbindCollectionItem(VisualElement e, int i)
         {
-            var overlay = e.Q(DragAndDropHandler.overlayElementName);
+            var overlay = e.Q(className: DragAndDropManipulator.overlayClassName);
             overlay.userData = null;
         }
 
@@ -339,16 +338,16 @@ VisualElement MakeListItem()
         {
             var e = new VisualElement { name = "ListElementParent" };
 
-            var overlay = new VisualElement { name = DragAndDropHandler.overlayElementName, pickingMode = PickingMode.Ignore };
+            var overlay = new VisualElement { pickingMode = PickingMode.Ignore };
             e.Add(overlay);
             overlay.StretchToParentSize();
 
             const int spriteSizeMargin = 5;
             var spriteSizeAdjustedForMargin = m_AdjustedViewSize - spriteSizeMargin;
-            var spriteSlot = new Image { name = "ListSpriteSlot", style = { width = spriteSizeAdjustedForMargin, height = spriteSizeAdjustedForMargin } };
+            var spriteSlot = new Image { name = "ListSpriteSlot", pickingMode = PickingMode.Ignore, style = { width = spriteSizeAdjustedForMargin, height = spriteSizeAdjustedForMargin } };
             e.Add(spriteSlot);
 
-            var label = new Label { name = IRenamableCollection.labelElementName };
+            var label = new Label { name = IRenamableCollection.labelElementName, pickingMode = PickingMode.Ignore };
             label.AddToClassList(k_ListLabelClassName);
             e.Add(label);
 
@@ -356,10 +355,10 @@ VisualElement MakeListItem()
             objField.RegisterValueChangedCallback(_ => SpriteReferenceChanged(objField));
             e.Add(objField);
 
-            DragAndDropHandler.SetupDragOverlay(e, overlay, k_LabelDragItemsStr, IsTabActive, (spritesData, alt) =>
+            e.AddManipulator(new DragAndDropManipulator(overlay, IsTabActive, (spritesData, alt) =>
             {
                 m_ViewEvents.onAddDataToLabels?.Invoke(spritesData, alt, overlay.userData.ToString());
-            });
+            }));
 
             return e;
         }
@@ -397,15 +396,13 @@ void BindListItem(VisualElement e, int i)
             objRef.SetValueWithoutNotify(labelData.sprite);
             objRef.userData = i;
 
-            objRef.RemoveFromClassList(SpriteLibraryEditorWindow.overrideClassName);
-            if (labelData.spriteOverride)
-                objRef.AddToClassList(SpriteLibraryEditorWindow.overrideClassName);
+            objRef.EnableInClassList(SpriteLibraryEditorWindow.overrideClassName, labelData.spriteOverride);
 
             e.RemoveFromClassList(SpriteLibraryEditorWindow.overrideClassName);
             if (labelData.categoryFromMain && !labelData.fromMain)
                 e.AddToClassList(SpriteLibraryEditorWindow.overrideClassName);
 
-            var overlay = e.Q(DragAndDropHandler.overlayElementName);
+            var overlay = e.Q(className: DragAndDropManipulator.overlayClassName);
             overlay.userData = labelData.name;
         }
 
@@ -413,21 +410,21 @@ VisualElement MakeGridItem()
         {
             var e = new VisualElement { name = "GridElementParent" };
 
-            var spriteSlot = new Image { name = "GridElementImage" };
+            var spriteSlot = new Image { name = "GridElementImage", pickingMode = PickingMode.Ignore };
             e.Add(spriteSlot);
 
-            var overlay = new VisualElement { name = DragAndDropHandler.overlayElementName, pickingMode = PickingMode.Ignore };
+            var overlay = new VisualElement { pickingMode = PickingMode.Ignore };
             spriteSlot.Add(overlay);
             overlay.StretchToParentSize();
 
-            var label = new Label { name = IRenamableCollection.labelElementName };
+            var label = new Label { name = IRenamableCollection.labelElementName, pickingMode = PickingMode.Ignore };
             label.AddToClassList(k_GridLabelClassName);
             e.Add(label);
 
-            DragAndDropHandler.SetupDragOverlay(e, overlay, k_LabelDragItemsStr, IsTabActive, (spritesData, alt) =>
+            e.AddManipulator(new DragAndDropManipulator(overlay, IsTabActive, (spritesData, alt) =>
             {
                 m_ViewEvents.onAddDataToLabels?.Invoke(spritesData, alt, overlay.userData.ToString());
-            });
+            }));
 
             return e;
         }
@@ -472,7 +469,7 @@ void BindGridItem(VisualElement e, int i)
             else
                 label.RemoveFromClassList(SpriteLibraryEditorWindow.overrideClassName);
 
-            var overlay = e.Q(DragAndDropHandler.overlayElementName);
+            var overlay = e.Q(className: DragAndDropManipulator.overlayClassName);
             overlay.userData = labelData.name;
         }
 
@@ -515,7 +512,7 @@ void ContextualManipulatorAddActions(ContextualMenuPopulateEvent evt)
                 evt.menu.AppendSeparator();
             }
 
-            var sprite = m_SelectedLabels.Any() ? m_SelectedLabels.Select(label => m_LabelData.FirstOrDefault(l => l.name == label)).FirstOrDefault(l => l.sprite != null)?.sprite : null;
+            var sprite = m_SelectedLabels.Any() ? m_SelectedLabels.Select(label => m_LabelData.FirstOrDefault(l => l.name == label)).FirstOrDefault(l => l?.sprite != null)?.sprite : null;
             evt.menu.AppendAction(TextContent.spriteLibraryShowLabel, _ => Selection.objects = new UnityEngine.Object[] { sprite }, _ => sprite != null ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Hidden);
         }
 
diff --git a/Editor/SpriteLib/SpriteLibraryEditor/WindowController.cs b/Editor/SpriteLib/SpriteLibraryEditor/WindowController.cs
index 2340ef19..767a2f21 100644
--- a/Editor/SpriteLib/SpriteLibraryEditor/WindowController.cs
+++ b/Editor/SpriteLib/SpriteLibraryEditor/WindowController.cs
@@ -570,7 +570,7 @@ void DeleteSelectedLabels()
 
         void SetLabelSprite(string labelName, Sprite newSprite)
         {
-            if (!hasSelectedLibrary || !m_Model.hasSelectedCategories || !m_Model.hasSelectedLabels)
+            if (!hasSelectedLibrary || !m_Model.hasSelectedCategories)
                 return;
 
             var labelData = GetLabelData(labelName);
diff --git a/Editor/SpriteLib/SpriteLibrarySourceAsset/SpriteLibrarySourceAssetImporterInspector.cs b/Editor/SpriteLib/SpriteLibrarySourceAsset/SpriteLibrarySourceAssetImporterInspector.cs
index a4b18ca0..ebf89312 100644
--- a/Editor/SpriteLib/SpriteLibrarySourceAsset/SpriteLibrarySourceAssetImporterInspector.cs
+++ b/Editor/SpriteLib/SpriteLibrarySourceAsset/SpriteLibrarySourceAssetImporterInspector.cs
@@ -150,6 +150,8 @@ public override void Action(int instanceId, string pathName, string resourceFile
             AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
 
             m_MainLibrary = string.Empty;
+
+            ProjectWindowUtil.ShowCreatedAsset(AssetDatabase.LoadAssetAtPath<Object>(pathName));
         }
 
         [MenuItem("Assets/Create/2D/Sprite Library Asset", priority = k_SpriteLibraryAssetMenuPriority)]
diff --git a/Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs b/Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs
new file mode 100644
index 00000000..4f69deed
--- /dev/null
+++ b/Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs
@@ -0,0 +1,309 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+using UnityEngine.U2D.Animation;
+using Object = UnityEngine.Object;
+
+namespace UnityEditor.U2D.Animation
+{
+    /// <summary>
+    /// Represents a Sprite Library's label.
+    /// </summary>
+    [Serializable]
+    public class SpriteLibraryLabel : ISpriteLibraryLabel
+    {
+        /// <summary>
+        /// Label's name.
+        /// </summary>
+        public string name => m_Name;
+
+        /// <summary>
+        /// Sprite associated with the label. 
+        /// </summary>
+        public Sprite sprite => m_Sprite;
+
+        [SerializeField]
+        string m_Name;
+
+        [SerializeField]
+        Sprite m_Sprite;
+
+        /// <summary>
+        /// Constructs a new label.
+        /// </summary>
+        /// <param name="labelName">Label's name.</param>
+        /// <param name="labelSprite">Label's Sprite.</param>
+        public SpriteLibraryLabel(string labelName, Sprite labelSprite)
+        {
+            m_Name = labelName;
+            m_Sprite = labelSprite;
+        }
+    }
+
+    /// <summary>
+    /// Represents a Sprite Library's category.
+    /// </summary>
+    [Serializable]
+    public class SpriteLibraryCategory : ISpriteLibraryCategory
+    {
+        /// <summary>
+        /// Category's name.
+        /// </summary>
+        public string name => m_Name;
+
+        /// <summary>
+        /// List of labels in category.
+        /// </summary>
+        public IEnumerable<ISpriteLibraryLabel> labels => m_Labels;
+
+        [SerializeField]
+        List<SpriteLibraryLabel> m_Labels;
+
+        [SerializeField]
+        string m_Name;
+
+        /// <summary>
+        /// Constructs a new category.
+        /// </summary>
+        /// <param name="categoryName">Category's name.</param>
+        /// <param name="categoryLabels">Collection of labels in a category.</param>
+        public SpriteLibraryCategory(string categoryName, IEnumerable<SpriteLibraryLabel> categoryLabels)
+        {
+            m_Name = categoryName;
+            m_Labels = new List<SpriteLibraryLabel>(categoryLabels);
+        }
+    }
+
+    /// <summary>
+    /// Class used for creating new Sprite Library Source Assets.
+    /// </summary>
+    public static class SpriteLibrarySourceAssetFactory
+    {
+        /// <summary>
+        /// Sprite Library Source Asset's extension.
+        /// </summary>
+        public const string extension = SpriteLibrarySourceAsset.extension;
+
+        /// <summary>
+        /// Creates a new Sprite Library Source Asset at a given path.
+        /// </summary>
+        /// <param name="path">Save path. Must be within the Assets folder.</param>
+        /// <param name="categories">Collection of categories in the library.</param>
+        /// <param name="mainLibraryPath">A path to the main library. Null if there is no main library.</param>
+        /// <returns>A relative path to the Project with correct extension.</returns>
+        /// <exception cref="InvalidOperationException">Throws when the save path is invalid/</exception>
+        public static string Create(string path, IEnumerable<ISpriteLibraryCategory> categories, string mainLibraryPath = null)
+        {
+            if (string.IsNullOrEmpty(path))
+                throw new InvalidOperationException("Save path cannot be null or empty.");
+
+            var relativePath = GetRelativePath(path);
+            if (string.IsNullOrEmpty(relativePath))
+                throw new InvalidOperationException($"{nameof(LoadSpriteLibrarySourceAsset)} can only be saved in the Assets folder.");
+
+            relativePath = Path.ChangeExtension(relativePath, extension);
+
+            SpriteLibraryAsset mainLibrary = null;
+            if (!string.IsNullOrEmpty(mainLibraryPath))
+            {
+                mainLibrary = AssetDatabase.LoadAssetAtPath<SpriteLibraryAsset>(mainLibraryPath);
+                if (mainLibrary == null)
+                    throw new InvalidOperationException($"No {nameof(SpriteLibraryAsset)} found at path: '{mainLibraryPath}'");
+            }
+
+            var asset = ScriptableObject.CreateInstance<SpriteLibrarySourceAsset>();
+            var categoryList = new List<SpriteLibCategoryOverride>();
+            if (categories != null)
+            {
+                foreach (var category in categories)
+                {
+                    var spriteLibCategory = new SpriteLibCategoryOverride
+                    {
+                        name = category.name,
+                        overrideEntries = new List<SpriteCategoryEntryOverride>()
+                    };
+                    foreach (var label in category.labels)
+                    {
+                        var spriteCategoryEntryOverride = new SpriteCategoryEntryOverride
+                        {
+                            name = label.name,
+                            spriteOverride = label.sprite
+                        };
+                        spriteLibCategory.overrideEntries.Add(spriteCategoryEntryOverride);
+                    }
+
+                    categoryList.Add(spriteLibCategory);
+                }
+            }
+
+            if (mainLibrary != null)
+            {
+                asset.SetPrimaryLibraryGUID(AssetDatabase.GUIDFromAssetPath(mainLibraryPath).ToString());
+
+                var newCategories = mainLibrary.categories ?? new List<SpriteLibCategory>();
+
+                var existingCategories = new List<SpriteLibCategoryOverride>(categoryList);
+                categoryList.Clear();
+
+                // populate new primary
+                foreach (var newCategory in newCategories)
+                {
+                    var labels = new List<SpriteCategoryEntryOverride>();
+                    SpriteLibCategoryOverride existingCategory = null;
+                    for (var i = 0; i < existingCategories.Count; i++)
+                    {
+                        var category = existingCategories[i];
+                        if (category.name == newCategory.name)
+                        {
+                            existingCategory = category;
+                            existingCategory.fromMain = true;
+                            existingCategories.RemoveAt(i);
+                            break;
+                        }
+                    }
+
+                    var newEntries = newCategory.categoryList;
+                    foreach (var newEntry in newEntries)
+                    {
+                        var sprite = newEntry.sprite;
+
+                        labels.Add(new SpriteCategoryEntryOverride
+                        {
+                            name = newEntry.name,
+                            sprite = sprite,
+                            spriteOverride = sprite,
+                            fromMain = true
+                        });
+                    }
+
+                    var overrideCount = 0;
+                    if (existingCategory != null)
+                    {
+                        foreach (var existingLabel in existingCategory.overrideEntries)
+                        {
+                            var foundLabel = false;
+                            foreach (var newLabel in labels)
+                            {
+                                if (existingLabel.name == newLabel.name)
+                                {
+                                    if (newLabel.spriteOverride != existingLabel.spriteOverride)
+                                    {
+                                        newLabel.spriteOverride = existingLabel.spriteOverride;
+                                        overrideCount++;
+                                    }
+
+                                    foundLabel = true;
+                                    break;
+                                }
+                            }
+
+                            if (!foundLabel)
+                            {
+                                overrideCount++;
+                                labels.Add(new SpriteCategoryEntryOverride
+                                {
+                                    name = existingLabel.name,
+                                    sprite = existingLabel.sprite,
+                                    spriteOverride = existingLabel.spriteOverride,
+                                    fromMain = false
+                                });
+                            }
+                        }
+                    }
+
+                    categoryList.Add(new SpriteLibCategoryOverride
+                    {
+                        name = newCategory.name,
+                        overrideEntries = labels,
+                        fromMain = true,
+                        entryOverrideCount = overrideCount
+                    });
+                }
+
+                foreach (var existingCategory in existingCategories)
+                {
+                    var keepCategory = false;
+                    if (existingCategory.fromMain)
+                    {
+                        for (var i = existingCategory.overrideEntries.Count; i-- > 0;)
+                        {
+                            var entry = existingCategory.overrideEntries[i];
+                            if (!entry.fromMain || entry.sprite != entry.spriteOverride)
+                            {
+                                entry.fromMain = false;
+                                entry.sprite = entry.spriteOverride;
+                                keepCategory = true;
+                            }
+                            else
+                                existingCategory.overrideEntries.RemoveAt(i);
+                        }
+                    }
+
+                    if (!existingCategory.fromMain || keepCategory)
+                    {
+                        existingCategory.fromMain = false;
+                        existingCategory.entryOverrideCount = 0;
+                        categoryList.Add(existingCategory);
+                    }
+                }
+            }
+
+            asset.SetLibrary(categoryList);
+
+            SpriteLibrarySourceAssetImporter.SaveSpriteLibrarySourceAsset(asset, relativePath);
+            Object.DestroyImmediate(asset);
+            return relativePath;
+        }
+
+        /// <summary>
+        /// Creates a new Sprite Library Source Asset at a given path.
+        /// </summary>
+        /// <param name="path">Save path. Must be within the Assets folder.</param>
+        /// <param name="spriteLibraryAsset">Sprite Library Asset to be saved.</param>
+        /// <param name="mainLibraryPath">A path to the main library. Null if there is no main library.</param>
+        /// <returns>A relative path to the Project with correct extension.</returns>
+        /// <exception cref="InvalidOperationException">Throws when the save path is invalid/</exception>
+        public static string Create(string path, SpriteLibraryAsset spriteLibraryAsset, string mainLibraryPath = null)
+        {
+            return Create(path, spriteLibraryAsset.categories, mainLibraryPath);
+        }
+
+        /// <summary>
+        /// Creates a new Sprite Library Source Asset at a given path.
+        /// </summary>
+        /// <param name="spriteLibraryAsset">Sprite Library Asset to be saved.</param>
+        /// <param name="path">Save path. Must be within the Assets folder.</param>
+        /// <param name="mainLibraryPath">A path to the main library. Null if there is no main library.</param>
+        /// <returns>A relative path to the Project with correct extension.</returns>
+        /// <exception cref="InvalidOperationException">Throws when the save path is invalid/</exception>
+        public static string SaveAsSourceAsset(this SpriteLibraryAsset spriteLibraryAsset, string path, string mainLibraryPath = null)
+        {
+            return Create(path, spriteLibraryAsset, mainLibraryPath);
+        }
+
+        internal static SpriteLibrarySourceAsset LoadSpriteLibrarySourceAsset(string path)
+        {
+            var loadedObjects = UnityEditorInternal.InternalEditorUtility.LoadSerializedFileAndForget(path);
+            foreach (var obj in loadedObjects)
+            {
+                if (obj is SpriteLibrarySourceAsset asset)
+                    return asset;
+            }
+
+            return null;
+        }
+
+        static string GetRelativePath(string path)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+                return null;
+
+            if (!path.StartsWith("Assets/") && !path.StartsWith(Application.dataPath))
+                return null;
+
+            var pathStartIndex = path.IndexOf("Assets");
+            return pathStartIndex == -1 ? null : path.Substring(pathStartIndex);
+        }
+    }
+}
diff --git a/Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs.meta b/Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs.meta
new file mode 100644
index 00000000..5bce67d7
--- /dev/null
+++ b/Editor/SpriteLib/SpriteLibrarySourceAssetFactory.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bdeb3b0829b54c0c868afbe166a33a73
+timeCreated: 1699240829
\ No newline at end of file
diff --git a/Editor/SpriteLib/SpriteResolverInspector.cs b/Editor/SpriteLib/SpriteResolverInspector.cs
index ae9fc5bc..4de0f356 100644
--- a/Editor/SpriteLib/SpriteResolverInspector.cs
+++ b/Editor/SpriteLib/SpriteResolverInspector.cs
@@ -52,6 +52,13 @@ public void OnEnable()
             m_SpriteSkin = (target as SpriteResolver).GetComponent<SpriteSkin>();
             UpdateSpriteLibrary();
             spriteResolver.onDeserializedCallback += SpriteResolverDeserializedCallback;
+
+            EditorApplication.focusChanged += OnEditorFocusChanged;
+        }
+
+        void OnDisable()
+        {
+            EditorApplication.focusChanged -= OnEditorFocusChanged;
         }
 
         void SpriteResolverDeserializedCallback()
@@ -61,11 +68,17 @@ void SpriteResolverDeserializedCallback()
                 m_ReInitOnNextGUI = true;
             }
         }
-        
+
         SpriteResolver spriteResolver => target as SpriteResolver;
 
         bool IsSpriteHashAssigned => m_SpriteHash.intValue != 0;
 
+        void OnEditorFocusChanged(bool focused)
+        {
+            if (focused)
+                m_ReInitOnNextGUI = true;
+        }
+
         void GetCategoryAndLabelStringValue(out string categoryName, out string labelName)
         {
             categoryName = null;
@@ -75,13 +88,14 @@ void GetCategoryAndLabelStringValue(out string categoryName, out string labelNam
             {
                 var entryHash = m_SpriteHash.intValue;
                 spriteLib.GetCategoryAndEntryNameFromHash(entryHash, out categoryName, out labelName);
-                
+
                 if (!IsSpriteHashAssigned && (string.IsNullOrEmpty(categoryName) || string.IsNullOrEmpty(labelName)))
                 {
                     m_SpriteHash.intValue = InternalEngineBridge.ConvertFloatToInt(m_SpriteKey.floatValue);
                     entryHash = m_SpriteHash.intValue;
                     spriteLib.GetCategoryAndEntryNameFromHash(entryHash, out categoryName, out labelName);
                 }
+
                 if (!IsSpriteHashAssigned && (string.IsNullOrEmpty(categoryName) || string.IsNullOrEmpty(labelName)))
                 {
                     var labelHash = InternalEngineBridge.ConvertFloatToInt(m_LabelHash.floatValue);
@@ -96,21 +110,21 @@ void GetCategoryAndLabelStringValue(out string categoryName, out string labelNam
         void UpdateSpriteLibrary()
         {
             m_SpriteLibSelection.Clear();
-            
+
             var spriteLib = spriteResolver.spriteLibrary;
             string categoryName = "", labelName = "";
             if (spriteLib != null)
             {
                 GetCategoryAndLabelStringValue(out categoryName, out labelName);
                 var enumerator = spriteLib.categoryNames;
-                foreach(var category in enumerator)
+                foreach (var category in enumerator)
                 {
                     if (!m_SpriteLibSelection.ContainsKey(category))
                     {
                         var entries = spriteLib.GetEntryNames(category);
                         if (entries == null)
                             entries = new string[0];
-                        
+
                         var selectionList = new SpriteCategorySelectionList()
                         {
                             entryNames = entries.ToArray(),
@@ -122,10 +136,11 @@ void UpdateSpriteLibrary()
                         };
 
                         m_SpriteLibSelection.Add(category, selectionList);
-                        
+
                     }
                 }
             }
+
             m_CategorySelection = new string[1 + m_SpriteLibSelection.Keys.Count];
             m_CategorySelection[0] = Style.noCategory.text;
             for (var i = 0; i < m_SpriteLibSelection.Keys.Count; ++i)
@@ -135,6 +150,7 @@ void UpdateSpriteLibrary()
                 if (selection.categoryName == categoryName)
                     m_CategorySelectionIndex = i + 1;
             }
+
             ValidateCategorySelectionIndexValue();
             if (m_CategorySelectionIndex > 0)
             {
@@ -145,7 +161,7 @@ void UpdateSpriteLibrary()
                 {
                     var labelIndex = Array.FindIndex(m_SpriteLibSelection[categoryName].entryNames,
                         x => x == labelName);
-                    
+
                     if (labelIndex >= 0 ||
                         m_SpriteLibSelection[categoryName].entryNames.Length <= m_LabelSelectionIndex)
                     {
@@ -157,6 +173,7 @@ void UpdateSpriteLibrary()
             {
                 m_SpriteSelectorWidget.UpdateContents(new Sprite[0]);
             }
+
             spriteResolver.spriteLibChanged = false;
         }
 
@@ -182,11 +199,11 @@ public override void OnInspectorGUI()
 
             m_CategorySelectionIndex = Array.FindIndex(m_CategorySelection, x => x == currentCategoryValue);
             ValidateCategorySelectionIndexValue();
-            
+
             EditorGUI.BeginChangeCheck();
             using (new EditorGUI.DisabledScope(m_CategorySelection.Length <= 1))
                 m_CategorySelectionIndex = EditorGUILayout.Popup(Style.categoryLabel, m_CategorySelectionIndex, m_CategorySelection);
-            
+
             SpriteCategorySelectionList selection;
             m_SpriteLibSelection.TryGetValue(m_CategorySelection[m_CategorySelectionIndex], out selection);
 
@@ -199,16 +216,16 @@ public override void OnInspectorGUI()
             {
                 if (entryNames.Length == 0)
                 {
-                    m_LabelSelectionIndex = EditorGUILayout.Popup(Style.labelLabel, 0, new [] {Style.categoryIsEmptyLabel});
+                    m_LabelSelectionIndex = EditorGUILayout.Popup(Style.labelLabel, 0, new[] { Style.categoryIsEmptyLabel });
                 }
                 else
                 {
                     m_LabelSelectionIndex = EditorGUILayout.Popup(Style.labelLabel, m_LabelSelectionIndex, entryNames);
                 }
             }
-                
+
             m_LabelSelectionIndex = m_SpriteSelectorWidget.ShowGUI(m_LabelSelectionIndex);
-            
+
 
             if (EditorGUI.EndChangeCheck())
             {
@@ -256,7 +273,7 @@ public override void OnInspectorGUI()
             if (m_SpriteSelectorWidget.NeedUpdatePreview())
                 this.Repaint();
         }
-        
+
         void ApplyModifiedProperty()
         {
             m_IgnoreNextDeserializeCallback = true;
diff --git a/Editor/SpritePostProcess.cs b/Editor/SpritePostProcess.cs
index 99272eaa..5ecfe4d2 100644
--- a/Editor/SpritePostProcess.cs
+++ b/Editor/SpritePostProcess.cs
@@ -190,11 +190,12 @@ static bool PostProcessSpriteMeshData(ISpriteEditorDataProvider spriteDataProvid
                 if (vertices.Length > 2)
                     indices = spriteMeshDataProvider.GetIndices(guid);
 
-                if (indices != null && indices.Length > 2 && vertices.Length > 2 )
+                var spriteBone = boneDataProvider.GetBones(guid);
+                var hasBones = spriteBone is { Count: > 0 };
+
+                if (indices != null && indices.Length > 2 && vertices.Length > 2)
                 {
                     var spriteRect = spriteRects.First(s => { return s.spriteID == guid; });
-                    var spriteBone = boneDataProvider.GetBones(guid);
-                    var hasBones = spriteBone != null && spriteBone.Count > 0;
                     var hasInvalidWeights = false;
 
                     var vertexArray = new NativeArray<Vector3>(vertices.Length, Allocator.Temp);
@@ -221,7 +222,8 @@ static bool PostProcessSpriteMeshData(ISpriteEditorDataProvider spriteDataProvid
                     sprite.SetVertexCount(vertices.Length);
                     sprite.SetVertexAttribute<Vector3>(VertexAttribute.Position, vertexArray);
                     sprite.SetIndices(indicesArray);
-                    sprite.SetVertexAttribute<BoneWeight>(VertexAttribute.BlendWeight, boneWeightArray);
+                    if (hasBones)
+                        sprite.SetVertexAttribute<BoneWeight>(VertexAttribute.BlendWeight, boneWeightArray);
                     vertexArray.Dispose();
                     boneWeightArray.Dispose();
                     indicesArray.Dispose();
@@ -243,13 +245,16 @@ static bool PostProcessSpriteMeshData(ISpriteEditorDataProvider spriteDataProvid
                 }
                 else
                 {
-                    var boneWeightArray = new NativeArray<BoneWeight>(sprite.GetVertexCount(), Allocator.Temp);
-                    var defaultBoneWeight = new BoneWeight() { weight0 = 1f };
+                    if (hasBones)
+                    {
+                        var boneWeightArray = new NativeArray<BoneWeight>(sprite.GetVertexCount(), Allocator.Temp);
+                        var defaultBoneWeight = new BoneWeight() { weight0 = 1f };
 
-                    for (var i = 0; i < boneWeightArray.Length; ++i)
-                        boneWeightArray[i] = defaultBoneWeight;
+                        for (var i = 0; i < boneWeightArray.Length; ++i)
+                            boneWeightArray[i] = defaultBoneWeight;
 
-                    sprite.SetVertexAttribute<BoneWeight>(VertexAttribute.BlendWeight, boneWeightArray);
+                        sprite.SetVertexAttribute<BoneWeight>(VertexAttribute.BlendWeight, boneWeightArray);
+                    }
                 }
             }
 
diff --git a/LICENSE.md b/LICENSE.md
index 42909187..a7b12864 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-com.unity.2d.animation copyright © 2021 Unity Technologies ApS
+com.unity.2d.animation copyright © 2023 Unity Technologies ApS
 
 Licensed under the Unity Companion License for Unity-dependent projects (see https://unity3d.com/legal/licenses/unity_companion_license).
 
diff --git a/Runtime/SpriteLib/ISpriteLibraryCategory.cs b/Runtime/SpriteLib/ISpriteLibraryCategory.cs
new file mode 100644
index 00000000..3d624925
--- /dev/null
+++ b/Runtime/SpriteLib/ISpriteLibraryCategory.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace UnityEngine.U2D.Animation
+{
+    /// <summary>
+    /// Represents a Sprite Library's category.
+    /// </summary>
+    public interface ISpriteLibraryCategory
+    {
+        /// <summary>
+        /// Category's name.
+        /// </summary>
+        string name { get; }
+
+        /// <summary>
+        /// Labels contained in the Category.
+        /// </summary>
+        IEnumerable<ISpriteLibraryLabel> labels { get; }
+    }
+}
diff --git a/Runtime/SpriteLib/ISpriteLibraryCategory.cs.meta b/Runtime/SpriteLib/ISpriteLibraryCategory.cs.meta
new file mode 100644
index 00000000..30cd808f
--- /dev/null
+++ b/Runtime/SpriteLib/ISpriteLibraryCategory.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 986937e46e4d473abaaef82ccc37b0a7
+timeCreated: 1701137747
\ No newline at end of file
diff --git a/Runtime/SpriteLib/ISpriteLibraryLabel.cs b/Runtime/SpriteLib/ISpriteLibraryLabel.cs
new file mode 100644
index 00000000..7e6f2337
--- /dev/null
+++ b/Runtime/SpriteLib/ISpriteLibraryLabel.cs
@@ -0,0 +1,18 @@
+namespace UnityEngine.U2D.Animation
+{
+    /// <summary>
+    /// Represents a Sprite Library's label.
+    /// </summary>
+    public interface ISpriteLibraryLabel
+    {
+        /// <summary>
+        /// Label's name.
+        /// </summary>
+        string name { get; }
+
+        /// <summary>
+        /// Label's Sprite.
+        /// </summary>
+        Sprite sprite { get; }
+    }
+}
diff --git a/Runtime/SpriteLib/ISpriteLibraryLabel.cs.meta b/Runtime/SpriteLib/ISpriteLibraryLabel.cs.meta
new file mode 100644
index 00000000..bf9bef63
--- /dev/null
+++ b/Runtime/SpriteLib/ISpriteLibraryLabel.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e7446a5d37e345a68c05da1ab90f0a69
+timeCreated: 1701137735
\ No newline at end of file
diff --git a/Runtime/SpriteLib/SpriteLibraryAsset.cs b/Runtime/SpriteLib/SpriteLibraryAsset.cs
index a9920a03..57525c23 100644
--- a/Runtime/SpriteLib/SpriteLibraryAsset.cs
+++ b/Runtime/SpriteLib/SpriteLibraryAsset.cs
@@ -15,7 +15,7 @@ internal interface INameHash
 
     [Serializable]
     [MovedFrom("UnityEngine.Experimental.U2D.Animation")]
-    internal class SpriteCategoryEntry : INameHash
+    internal class SpriteCategoryEntry : INameHash, ISpriteLibraryLabel
     {
         [SerializeField]
         string m_Name;
@@ -48,7 +48,7 @@ public void UpdateHash()
 
     [Serializable]
     [MovedFrom("UnityEngine.Experimental.U2D.Animation")]
-    internal class SpriteLibCategory : INameHash
+    internal class SpriteLibCategory : INameHash, ISpriteLibraryCategory
     {
         [SerializeField]
         string m_Name;
@@ -75,6 +75,8 @@ public List<SpriteCategoryEntry> categoryList
             set => m_CategoryList = value;
         }
 
+        public IEnumerable<ISpriteLibraryLabel> labels => m_CategoryList;
+
         public void UpdateHash()
         {
             m_Hash = SpriteLibraryUtility.GetStringHash(m_Name);
diff --git a/Runtime/SpriteSkin.cs b/Runtime/SpriteSkin.cs
index a7d04d38..0557637b 100644
--- a/Runtime/SpriteSkin.cs
+++ b/Runtime/SpriteSkin.cs
@@ -110,7 +110,11 @@ struct TransformData
         internal SpriteRenderer spriteRenderer => m_SpriteRenderer;
         internal NativeCustomSlice<BoneWeight> spriteBoneWeights => m_SpriteBoneWeights;
 
-        internal bool autoRebind
+        /// <summary>
+        /// Get and set the Auto Rebind property.
+        /// When enabled, Sprite Skin attempts to automatically locate the Transform that is needed for the current Sprite assigned to the Sprite Renderer.
+        /// </summary>
+        public bool autoRebind
         {
             get => m_AutoRebind;
             set
diff --git a/package.json b/package.json
index dc266e6c..55ad5ae6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.unity.2d.animation",
-  "version": "9.0.4",
+  "version": "9.1.0",
   "unity": "2022.2",
   "displayName": "2D Animation",
   "description": "2D Animation provides all the necessary tooling and runtime components for skeletal animation using Sprites.",
@@ -10,16 +10,16 @@
   ],
   "category": "2D",
   "dependencies": {
-    "com.unity.2d.common": "8.0.1",
+    "com.unity.2d.common": "8.0.2",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.collections": "1.1.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.uielements": "1.0.0"
   },
   "relatedPackages": {
-    "com.unity.2d.animation.tests": "9.0.4",
-    "com.unity.2d.common.tests": "8.0.1",
-    "com.unity.2d.psdimporter": "8.0.2"
+    "com.unity.2d.animation.tests": "9.1.0",
+    "com.unity.2d.common.tests": "8.0.2",
+    "com.unity.2d.psdimporter": "8.0.4"
   },
   "samples": [
     {
@@ -29,15 +29,15 @@
     }
   ],
   "_upm": {
-    "changelog": "### Fixed\n- Fixed an issue where the FK doesn't blend correctly with the IK if solver solves from the bind pose. (case DANB-482)\n- Added correct help documentation link to Sprite Library Asset. (case DANB-486)"
+    "changelog": "### Fixed\n- Blend weight vertex attribute is added only when sprite has bones. (case DANB-520)\n- Sprite Library editor drag and drop interactions. (case DANB-535)\n- Sprite Library editor drag and drop blocked by labels. (case DANB-558)\n- Adjust the copy-paste logic to not paste sprite mesh to the same sprite twice. (case DANB-530)\n- Sprite Library Asset is selected on creation. (case DANB-542)\n- Sprite Resolver previews not visible after editor regained focus. (case DANB-564)\n\n### Added\n- SpriteSkin's Auto Rebind property can now be accessed from scripts. (case DANB-490)\n- Sprite Library public API to save an asset as a .spriteLib SpriteLibrarySourceAsset."
   },
   "upmCi": {
-    "footprint": "b06b0b1c49fb0066fee85044da1fa6436badeae8"
+    "footprint": "b3146d6bc37f861bad7a2d1151394c33c17d8158"
   },
-  "documentationUrl": "https://docs.unity3d.com/Packages/com.unity.2d.animation@9.0/manual/index.html",
+  "documentationUrl": "https://docs.unity3d.com/Packages/com.unity.2d.animation@9.1/manual/index.html",
   "repository": {
     "url": "https://github.cds.internal.unity3d.com/unity/2d.git",
     "type": "git",
-    "revision": "be60dd1716d39b00d03d87668a09a4fc1d4102b6"
+    "revision": "dfc01cb8076aa8ca74afe1ded252f91c99b080ac"
   }
 }