feat: paste functionality + fix chat entry asset structure (#3084)

* Added new button to chat bubble + some layout fixes + show on hover * Added paste logic and hasValue check for clipboard * Added logic to show paste popup anywhere from anywhere + paste logic * Fixed some logic + prefabs * Fixed functionality + paste prefab tweaks * missing changes * Post dev merge fix * Changes to Chat Entries to be properly reused prefabs * Fixed chat scale * Fixed paste popup canvas ref * Fixed some rect issues with own chats * Fix after merge * Extracted design consts into SO for easier access * Update ChatEntryConfigurationSO.cs * fixed chat scale * Re-added missing paste popup position marker * Added character limit check when pasting text * Added context menu with copy option * fixed closing task * Update ChatController.cs * Fixed non masked frame on chats * Fixes from CR * Added clipboard manager service class to handle clipboard operations and callbacks * Update ChatController.cs * tweaks to clipboard manager
decentraland · Jan 16, 2025 · 39eb183 · 39eb183
1 parent 6675483
commit 39eb183
Show file tree

Hide file tree

Showing 62 changed files with 4,720 additions and 3,828 deletions.
diff --git a/Explorer/Assets/AddressableAssetsData/AssetGroups/Chat.asset b/Explorer/Assets/AddressableAssetsData/AssetGroups/Chat.asset
@@ -17,6 +17,26 @@ MonoBehaviour:
     m_SerializedData: []
   m_GUID: 8b013415c163949639034d60860ef87f
   m_SerializeEntries:
+  - m_GUID: 20fcd3bb3495c4af78b93a75fc26fccf
+    m_Address: EmojiSuggestionBox
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 51646f2adc3264ba7bf9b4f90febbd22
+    m_Address: EmojiPanelConfig
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 52e1c4c3ef9524f3a9d48c3c2216036d
+    m_Address: Assets/DCL/Chat/Assets/ChatEntry_Own.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 543dff6efe38c4acb9118c149e6c6eca
+    m_Address: EmojiPanel
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 5bc332aa8fd2147cab980e20e64bec03
     m_Address: EmojiSuggestion
     m_ReadOnly: 0
@@ -27,13 +47,13 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 51646f2adc3264ba7bf9b4f90febbd22
-    m_Address: EmojiPanelConfig
+  - m_GUID: 738b2479bcbccba45b0c649ce580ef7a
+    m_Address: ChatAtlas.spriteatlasv2
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f3b1d401bc50845629a6b982f9793f16
-    m_Address: Chat
+  - m_GUID: 7d0a647adf3334ee1a142e7bf69f128d
+    m_Address: EmojiButton
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
@@ -42,23 +62,23 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 20fcd3bb3495c4af78b93a75fc26fccf
-    m_Address: EmojiSuggestionBox
+  - m_GUID: d845292f5e8993041befc3df2e68e96e
+    m_Address: Assets/DCL/Chat/Assets/ChatEntry_OtherUser.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 543dff6efe38c4acb9118c149e6c6eca
-    m_Address: EmojiPanel
+  - m_GUID: efdc5e8175a88de4eaaf5800a0e3bea8
+    m_Address: Assets/DCL/Chat/Assets/ChatEntry_System.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 7d0a647adf3334ee1a142e7bf69f128d
-    m_Address: EmojiButton
+  - m_GUID: f3b1d401bc50845629a6b982f9793f16
+    m_Address: Chat
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 738b2479bcbccba45b0c649ce580ef7a
-    m_Address: ChatAtlas.spriteatlasv2
+  - m_GUID: f74fa2421d947f4439553458ae5fbd93
+    m_Address: Assets/DCL/UI/Assets/ChatEntryMenuPopupView.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0

diff --git a/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset b/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
@@ -147,6 +147,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: d67c9347412c7d04aa84f48952e986fc
+    m_Address: Assets/DCL/UI/Assets/PastePopupToastView.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: dbfb7e67a438449f9a887f820f733868
     m_Address: Assets/DCL/UI/Popups/PopupCloser.prefab
     m_ReadOnly: 0

diff --git a/Explorer/Assets/DCL/Chat/Assets/Chat.prefab b/Explorer/Assets/DCL/Chat/Assets/Chat.prefab
@@ -705,19 +705,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mItemPrefabDataList:
-  - mItemPrefab: {fileID: 315238571471859014, guid: 52e1c4c3ef9524f3a9d48c3c2216036d, type: 3}
+  - mItemPrefab: {fileID: 315238571471859014, guid: d845292f5e8993041befc3df2e68e96e, type: 3}
     mPadding: 4
     mInitCreateCount: 3
     mStartPosOffset: 0
-  - mItemPrefab: {fileID: 8150196112421136534, guid: e3a4405d489824695b3e3fb7b8a2e4a7, type: 3}
+  - mItemPrefab: {fileID: 315238571471859014, guid: 52e1c4c3ef9524f3a9d48c3c2216036d, type: 3}
     mPadding: 4
     mInitCreateCount: 3
     mStartPosOffset: 0
   - mItemPrefab: {fileID: 3875157040883307976}
     mPadding: 4
     mInitCreateCount: 2
     mStartPosOffset: 0
-  - mItemPrefab: {fileID: 4868610521581754763, guid: 1cdca82f0db4d494388f804c62642ba2, type: 3}
+  - mItemPrefab: {fileID: 315238571471859014, guid: efdc5e8175a88de4eaaf5800a0e3bea8, type: 3}
     mPadding: 4
     mInitCreateCount: 2
     mStartPosOffset: 0
@@ -905,6 +905,7 @@ MonoBehaviour:
   <LoopList>k__BackingField: {fileID: 6671003195211882300}
   <EmojiPanelButton>k__BackingField: {fileID: 5796404896790943328}
   <CloseChatButton>k__BackingField: {fileID: 1104092725699042680}
+  <PastePopupPosition>k__BackingField: {fileID: 8997778028803641515}
   <AddEmojiAudio>k__BackingField: {fileID: 11400000, guid: ab59a5b2a814f02419850961fc490805, type: 2}
   <OpenEmojiPanelAudio>k__BackingField: {fileID: 11400000, guid: abc438e2962540549b414d54fbc89eed, type: 2}
   <ChatSendMessageAudio>k__BackingField: {fileID: 11400000, guid: efe341aa011f4c8428d3246fa65ef5b0, type: 2}
@@ -1068,6 +1069,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2ebd3771315604fc09ca02ca37850846, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &8997778028803641515 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7413724693438948208, guid: 754fd4e2bb7828240808af9ce37feb93, type: 3}
+  m_PrefabInstance: {fileID: 1890474067062928347}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1949774983281342339
 PrefabInstance:
   m_ObjectHideFlags: 0