com.beamable 5.0.1 → 5.1.0-PREVIEW.RC10

package/Editor/UI/ContentWindow/ContentWindow_ContentActions.cs

@@ -2,9 +2,11 @@
 using Beamable.Common.BeamCli.Contracts;
 using Beamable.Common.Content;
 using Beamable.Editor;
+using Beamable.Editor.ContentService;
 using Beamable.Editor.Util;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Beamable.Common;
 using Beamable.Editor.BeamCli.UI;
@@ -19,7 +21,7 @@ namespace Beamable.Editor.UI.ContentWindow
 
 		private Dictionary<string, bool> _foldoutStates = new()
 		{
-			{"Created Contents", true}, {"Modified Contents", true}, {"Deleted Contents", true}
+			{"Created Contents", true}, {"Modified Contents", true}, {"Deleted Contents", true}, {"Renamed Contents", true}
 		};
 
 		private Vector2 _mainScrollPosition;
@@ -31,7 +33,7 @@ namespace Beamable.Editor.UI.ContentWindow
 		{
 			if (_contentService.HasConflictedContent || _contentService.HasInvalidContent || !_contentService.HasChangedContents)
 			{
-				ChangeWindowStatus(ContentWindowStatus.Normal);
+				ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 				return;
 			}
 			
@@ -43,7 +45,7 @@ namespace Beamable.Editor.UI.ContentWindow
 				{
 					_contentService.PublishContentsWithProgress().Then(_ =>
 					{
-						ChangeWindowStatus(ContentWindowStatus.Normal);
+						ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 					});
 				}
 			}
@@ -55,9 +57,9 @@ namespace Beamable.Editor.UI.ContentWindow
 		
 		private void DrawRevertPanel()
 		{
-			if (!_contentService.HasChangedContents)
+			if (!_contentService.HasChangedContents && !_contentService.CurrentProgress.IsActive)
 			{
-				ChangeWindowStatus(ContentWindowStatus.Normal);
+				ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 				return;
 			}
 			
@@ -69,7 +71,7 @@ namespace Beamable.Editor.UI.ContentWindow
 				{ 
 					_revertAction?.Invoke().Then(_ =>
 					{
-						ChangeWindowStatus(ContentWindowStatus.Normal);
+						ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 					});
 				}
 			}
@@ -195,7 +197,7 @@ namespace Beamable.Editor.UI.ContentWindow
 			GUILayout.FlexibleSpace();
 			if (BeamGUI.CancelButton("Back", GUILayout.Width(60)))
 			{
-				ChangeWindowStatus(ContentWindowStatus.Normal);
+				ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 			}
 		}
 		
@@ -206,8 +208,14 @@ namespace Beamable.Editor.UI.ContentWindow
 			var allCreated = (_statusToDraw & ContentStatus.Created) != 0 ? _contentService.GetAllContentFromStatus(ContentStatus.Created) : emptyList;
 			var allDeleted = (_statusToDraw & ContentStatus.Deleted) != 0 ? _contentService.GetAllContentFromStatus(ContentStatus.Deleted) : emptyList;
 
+			// Separate renamed items from Created/Deleted lists
+			var allRenames = _contentService.GetAllRenames();
+			var renamedCreatedIds = new HashSet<string>(allRenames.Select(r => r.CreatedFullId));
+			var renamedDeletedIds = new HashSet<string>(allRenames.Select(r => r.DeletedFullId));
+			allCreated = allCreated.Where(e => !renamedCreatedIds.Contains(e.FullId)).ToList();
+			allDeleted = allDeleted.Where(e => !renamedDeletedIds.Contains(e.FullId)).ToList();
+
 			float screenWidth = EditorGUIUtility.currentViewWidth;
-			// float availableSpace = Mathf.Max(screenWidth, ACTION_PANEL_MIN_WIDTH);
 			float availableSpace = Mathf.Max(screenWidth, ACTION_PANEL_MIN_WIDTH);
 
 			EditorGUILayout.BeginVertical();
@@ -217,14 +225,14 @@ namespace Beamable.Editor.UI.ContentWindow
 			GUI.DrawTexture(texRect, icon);
 			EditorGUILayout.LabelField(title, _contentHeaderStyle);
 			EditorGUILayout.EndHorizontal();
-			
+
 			GUILayout.Space(12);
 			EditorGUILayout.LabelField(warningMessage, _contentHeaderDescriptionStyle);
 			GUILayout.Space(12);
-		
-			
+
+
 			EditorGUILayout.Space(12);
-			
+
 			_mainScrollPosition = EditorGUILayout.BeginScrollView(_mainScrollPosition, GUILayout.ExpandWidth(true));
 			const int widthOfAUnityScrollBar = 25;
 			availableSpace -= widthOfAUnityScrollBar + NESTED_CONTENT_PADDING*2;
@@ -235,31 +243,76 @@ namespace Beamable.Editor.UI.ContentWindow
 			DrawChangedContents(availableSpace, "Created Contents", BeamGUI.iconStatusAdded, allCreated, showRevert);
 			DrawChangedContents(availableSpace, "Modified Contents", BeamGUI.iconStatusModified, allModified, showRevert);
 			DrawChangedContents(availableSpace, "Deleted Contents", BeamGUI.iconStatusDeleted, allDeleted, showRevert);
-			
+			if (allRenames.Count > 0)
+			{
+				DrawRenamedContents(availableSpace, "Renamed Contents", BeamGUI.iconStatusModified, allRenames, showRevert);
+			}
+
 			EditorGUILayout.EndVertical();
 			EditorGUILayout.EndScrollView();
 			
 			EditorGUILayout.Space(12);
+
+			if (DrawContentOperationProgress())
+			{
+				EditorGUILayout.Space(12);
+			}
 			
 			var buttonsRect = EditorGUILayout.GetControlRect(GUILayout.ExpandWidth(true), GUILayout.Height(30f));
 			var buttonsRectController = new EditorGUIRectController(buttonsRect);
 			var primaryBtnContent = new GUIContent(buttonText);
 			var primaryBtnSize = GUI.skin.button.CalcSize(primaryBtnContent);
 			
-			if (BeamGUI.PrimaryButton(buttonsRectController.ReserveWidthFromRight(primaryBtnSize.x + BASE_PADDING * 2), primaryBtnContent))
+			if (BeamGUI.ShowDisabled(!_contentService.CurrentProgress.IsActive,
+			                         () => BeamGUI.PrimaryButton(buttonsRectController.ReserveWidthFromRight(primaryBtnSize.x + BASE_PADDING * 2), primaryBtnContent)))
 			{
 				onButtonClicked?.Invoke();
 			}
 			var cancelBtnContent = new GUIContent("Cancel");
 			var cancelBtnSize = GUI.skin.button.CalcSize(cancelBtnContent);
-			if (BeamGUI.CustomButton(buttonsRectController.ReserveWidthFromRight(cancelBtnSize.x + BASE_PADDING * 2), cancelBtnContent, BeamGUI.ColorizeButton(Color.gray)))
+			if (BeamGUI.ShowDisabled(!_contentService.CurrentProgress.IsActive,
+			                         () => BeamGUI.CustomButton(buttonsRectController.ReserveWidthFromRight(cancelBtnSize.x + BASE_PADDING * 2), cancelBtnContent, BeamGUI.ColorizeButton(Color.gray))))
 			{
-				ChangeWindowStatus(ContentWindowStatus.Normal);
+				ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 			}
 
 			EditorGUILayout.EndVertical();
 		}
 
+		/// <summary>
+		/// Draws the active content operation progress bar in the Content Manager action panel.
+		/// </summary>
+		/// <returns>True when progress UI was drawn and the caller should reserve spacing for it.</returns>
+		private bool DrawContentOperationProgress()
+		{
+			var progress = _contentService.CurrentProgress;
+			if (!progress.IsActive)
+			{
+				return false;
+			}
+
+			var progressAction = progress.Title == "Publish Contents" ? "published" : "synced";
+			var progressText = progress.TotalItems > 0
+				? $"{progress.ProcessedItems}/{progress.TotalItems} items {progressAction}"
+				: $"Preparing {progress.Title.ToLowerInvariant()}...";
+
+			if (!string.IsNullOrEmpty(progress.CurrentContentName))
+			{
+				progressText = $"{progressText} - {progress.CurrentContentName}";
+			}
+
+			EditorGUILayout.LabelField(progress.Title, EditorStyles.boldLabel);
+			var progressRect = EditorGUILayout.GetControlRect(GUILayout.ExpandWidth(true), GUILayout.Height(20));
+			EditorGUI.ProgressBar(progressRect, progress.Progress, progressText);
+
+			if (!string.IsNullOrEmpty(progress.Description))
+			{
+				EditorGUILayout.LabelField(progress.Description, _contentHeaderDescriptionStyle);
+			}
+
+			return true;
+		}
+
 		private void DrawChangedContents(float width,
 		                                 string headerName,
 		                                 Texture icon,
@@ -349,6 +402,85 @@ namespace Beamable.Editor.UI.ContentWindow
 			EditorGUILayout.EndVertical();
 		}
 
+		private void DrawRenamedContents(float width, string headerName, Texture icon,
+			List<ContentRenameInfo> renames, bool showRevert)
+		{
+			if (renames.Count == 0) return;
+
+			_foldoutStates.TryAdd(headerName, true);
+
+			var heightSize = CalculateContentsHeight(_foldoutStates[headerName], renames.Count);
+			EditorGUILayout.BeginVertical();
+			var rectController =
+				new EditorGUIRectController(
+					EditorGUILayout.GetControlRect(GUILayout.Width(width), GUILayout.Height(heightSize)));
+
+			GUI.Box(rectController.rect, GUIContent.none, EditorStyles.helpBox);
+			var headerRect = new EditorGUIRectController(rectController.ReserveHeight(BeamGUI.StandardVerticalSpacing * 1.5f));
+
+			headerRect.ReserveWidth(BASE_PADDING);
+			var foldoutRect = headerRect.ReserveWidth(FOLDOUT_WIDTH);
+			_foldoutStates[headerName] = EditorGUI.Foldout(foldoutRect, _foldoutStates[headerName], GUIContent.none);
+
+			var iconSize = 15f;
+			var iconRect = headerRect.ReserveWidth(iconSize);
+			GUI.DrawTexture(new Rect(iconRect.x, iconRect.center.y - iconSize / 2f, iconSize, iconSize), icon, ScaleMode.ScaleToFit);
+
+			headerRect.ReserveWidth(BASE_PADDING);
+
+			var labelRect = headerRect.rect;
+			var guiStyle = new GUIStyle(EditorStyles.boldLabel) { alignment = TextAnchor.MiddleLeft };
+			EditorGUI.LabelField(labelRect, headerName, guiStyle);
+
+			if (_foldoutStates[headerName])
+			{
+				foreach (var rename in renames)
+				{
+					var itemRect = rectController.ReserveSingleLine();
+					EditorGUILayout.BeginHorizontal();
+					{
+						itemRect.xMin = iconRect.xMax;
+						itemRect.width -= BASE_PADDING;
+						var itemRectController = new EditorGUIRectController(itemRect);
+
+						var itemIconRect = itemRectController.ReserveWidth(iconSize);
+						itemRectController.ReserveWidth(BASE_PADDING);
+
+						Rect buttonRect = default;
+						if (showRevert)
+						{
+							buttonRect = itemRectController.ReserveWidthFromRight(80);
+						}
+						var contentRect = itemRectController.rect;
+						var displayText = $"{rename.DeletedFullId}  →  {rename.NewName}";
+						var entryContent = new GUIContent(displayText, displayText);
+						EditorGUI.LabelField(contentRect, entryContent);
+						if (showRevert)
+						{
+							var revertContent = new GUIContent("Revert", BeamGUI.iconRevertAction,
+							                                   "Revert this rename to its original name");
+							if (GUI.Button(buttonRect, revertContent))
+							{
+								if (EditorUtility.DisplayDialog("Revert Rename",
+								                                $"Are you sure you want to revert the rename of {rename.OldName}?",
+								                                "Revert", "Cancel"))
+								{
+									var bothIds = $"{rename.CreatedFullId},{rename.DeletedFullId}";
+									_ = _contentService.SyncContentsWithProgress(
+										true, true, true, true, bothIds,
+										ContentFilterType.ExactIds);
+								}
+							}
+						}
+					}
+					EditorGUILayout.EndHorizontal();
+					rectController.ReserveHeight(EditorGUIUtility.standardVerticalSpacing);
+				}
+			}
+
+			EditorGUILayout.EndVertical();
+		}
+
 		private float CalculateContentsHeight(bool isOpen, int entriesCount)
 		{
 			var height = BeamGUI.StandardVerticalSpacing * 1.5f; // Header

package/Editor/UI/ContentWindow/ContentWindow_Header.cs

@@ -1,7 +1,9 @@
 using Beamable;
 using Beamable.Common.BeamCli.Contracts;
+using Beamable.Common.Content;
 using Beamable.Editor.BeamCli.Commands;
 using Beamable.Editor.BeamCli.UI.LogHelpers;
+using Beamable.Editor.ContentService;
 using Beamable.Editor.Util;
 using Beamable.Editor.UI2.Utils;
 using System.Collections.Generic;
@@ -119,7 +121,7 @@ namespace Beamable.Editor.UI.ContentWindow
 			{
 				if (BeamGUI.HeaderButton("Content Editor", BeamGUI.iconContentEditorIcon, width: 90, iconPadding: 2))
 				{
-					ChangeWindowStatus(ContentWindowStatus.Normal);
+					ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 				}
 			}
 			if (_windowStatus is ContentWindowStatus.Normal || _windowStatus is ContentWindowStatus.Validate)
@@ -260,6 +262,17 @@ namespace Beamable.Editor.UI.ContentWindow
 				Repaint();
 		}
 
+		/// <summary>
+		/// Defers Content Manager state changes until the current IMGUI event has finished.
+		/// </summary>
+		/// <remarks>
+		/// Some state transitions remove or add controls. Deferring them avoids mismatched layout groups during repaint.
+		/// </remarks>
+		private void ChangeWindowStatusDelayed(ContentWindowStatus windowStatus)
+		{
+			EditorApplication.delayCall += () => ChangeWindowStatus(windowStatus);
+		}
+
 		private void DrawLowBarHeader(Rect rect)
 		{
 			if (NeedsMigration) return;
@@ -420,27 +433,38 @@ namespace Beamable.Editor.UI.ContentWindow
 
 		private async Promise RevertAllContents()
 		{
-			await _contentService.SyncContentsWithProgress(true, true, true, true);
+			await _contentService.SyncContentsWithProgress(true, true, true, true, showUnityModalProgress: false);
 		}
 
 		private async Promise RevertModifiedContents()
 		{
-			await _contentService.SyncContentsWithProgress(true, false, false, false);
+			// Capture renames before the first sync clears the registry via Reload()
+			var renames = _contentService.GetAllRenames();
+
+			await _contentService.SyncContentsWithProgress(true, false, false, false, showUnityModalProgress: false);
+
+			if (renames.Count > 0)
+			{
+				var renameIds = string.Join(",",
+					renames.SelectMany(r => new[] { r.CreatedFullId, r.DeletedFullId }));
+				await _contentService.SyncContentsWithProgress(
+					true, true, true, true, renameIds, ContentFilterType.ExactIds);
+			}
 		}
 
 		private async Promise RevertConflictedContents()
 		{
-			await _contentService.SyncContentsWithProgress(false, false, true, false);
+			await _contentService.SyncContentsWithProgress(false, false, true, false, showUnityModalProgress: false);
 		}
 
 		private async Promise RevertDeletedContents()
 		{
-			await _contentService.SyncContentsWithProgress(false, false, false, true);
+			await _contentService.SyncContentsWithProgress(false, false, false, true, showUnityModalProgress: false);
 		}
 
 		private async Promise RevertAllNewContents()
 		{
-			await _contentService.SyncContentsWithProgress(false, true, false, false);
+			await _contentService.SyncContentsWithProgress(false, true, false, false, showUnityModalProgress: false);
 		}
 
 		

package/Editor/UI/ContentWindow/ContentWindow_ItemsPanel.cs

@@ -387,6 +387,9 @@ namespace Beamable.Editor.UI.ContentWindow
 			}
 			
 			var contentObject = CreateInstance(type) as ContentObject;
+			// Force Unity's serializer to instantiate all nested [Serializable] reference fields
+			// (e.g. Optional abd strings types) with proper default instances instead of leaving them null.
+			JsonUtility.FromJsonOverwrite(JsonUtility.ToJson(contentObject), contentObject);
 			string baseName = $"New_{itemType.Replace(".","_")}_";
 			int nextNumber = _contentService.GetContentsFromType(type)
 			                                .Select(item => item.Name)
@@ -549,10 +552,19 @@ namespace Beamable.Editor.UI.ContentWindow
 
 			string lastUpdateDate = DateTimeOffset.FromUnixTimeMilliseconds(entry.LatestUpdateAtDate).ToLocalTime().ToString("g");
 
+			bool isRenamed = _contentService.TryGetRenameInfo(entry.FullId, out var renameInfo)
+			                 && renameInfo.CreatedFullId == entry.FullId;
+			if (isRenamed)
+				nameLabel = isEditingName ? nameLabel : $"{entry.Name} (renamed from {renameInfo.OldName})";
+
 			string[] values = {nameLabel, entry.Tags != null ? string.Join(", ", entry.Tags) : "-", lastUpdateDate};
-			Texture iconForEntry = !_contentService.IsContentInvalid(entry.FullId)
-				? GetIconForStatus(entry.IsInConflict, entry.StatusEnum)
-				: BeamGUI.iconStatusInvalid;
+			Texture iconForEntry;
+			if (_contentService.IsContentInvalid(entry.FullId))
+				iconForEntry = BeamGUI.iconStatusInvalid;
+			else if (isRenamed)
+				iconForEntry = BeamGUI.iconStatusModified;
+			else
+				iconForEntry = GetIconForStatus(entry.IsInConflict, entry.StatusEnum);
 			Texture[] icons = {iconForEntry};
 
 			bool[] isEditable = {isEditingName};
@@ -782,7 +794,18 @@ namespace Beamable.Editor.UI.ContentWindow
 					});
 				}
 
-				if (entry.StatusEnum is not ContentStatus.UpToDate and not ContentStatus.Created)
+				if (_contentService.TryGetRenameInfo(entry.FullId, out var ctxRenameInfo)
+				    && ctxRenameInfo.CreatedFullId == entry.FullId)
+				{
+					menu.AddItem(new GUIContent($"Revert Item (renamed from {ctxRenameInfo.OldName})"), false,
+					             () =>
+					             {
+						             var bothIds = $"{ctxRenameInfo.CreatedFullId},{ctxRenameInfo.DeletedFullId}";
+						             _ = _contentService.SyncContentsWithProgress(
+							             true, true, true, true, bothIds, ContentFilterType.ExactIds);
+					             });
+				}
+				else if (entry.StatusEnum is not ContentStatus.UpToDate and not ContentStatus.Created)
 				{
 					menu.AddItem(new GUIContent("Revert Item"), false,
 					             () =>
@@ -1069,6 +1092,14 @@ namespace Beamable.Editor.UI.ContentWindow
 		                        HashSet<string> statuses,
 		                        string nameSearchPartValue)
 		{
+			// Hide the Deleted side of a detected rename — only the Created side (new name) is shown
+			if (entry.StatusEnum == ContentStatus.Deleted
+			    && _contentService.TryGetRenameInfo(entry.FullId, out var ri)
+			    && ri.DeletedFullId == entry.FullId)
+			{
+				return false;
+			}
+
 			// Check if it is the specificType
 			if (!string.IsNullOrEmpty(specificType) &&
 			    !entry.TypeName.Equals(specificType, StringComparison.InvariantCultureIgnoreCase))

package/Editor/UI/LibraryWindow/BeamLibraryWindow.cs

@@ -15,7 +15,7 @@ namespace Beamable.Editor.Library
 		{
 			WindowDefaultConfig = new BeamEditorWindowInitConfig()
 			{
-				Title = "Beam Library",
+				Title = "Beam Samples",
 				FocusOnShow = false,
 				DockPreferenceTypeName = typeof(SceneView).AssemblyQualifiedName,
 				RequireLoggedUser = true,
@@ -25,7 +25,7 @@ namespace Beamable.Editor.Library
 		[MenuItem(
 			Constants.MenuItems.Windows.Paths.MENU_ITEM_PATH_WINDOW_BEAMABLE + "/" +
 			Constants.Commons.OPEN + " " +
-			"Beam Library",
+			"Beam Samples",
 			priority = Constants.MenuItems.Windows.Orders.MENU_ITEM_PATH_WINDOW_PRIORITY_2
 		)]
 		public static async void Init() => _ = await GetFullyInitializedWindow();

package/Editor/UI/LibraryWindow/BeamLibraryWindow_Main.cs

@@ -8,28 +8,7 @@ namespace Beamable.Editor.Library
 	{
 		void DrawMain()
 		{
-			DrawHeader();
 			DrawSampleSection();
 		}
-
-		void DrawHeader()
-		{
-			BeamGUI.DrawHeaderSection(this, ActiveContext,
-			                          drawTopBarGui: () =>
-			                          {
-				                          // there aren't really any options that make sense yet.
-			                          }, 
-			                          drawLowBarGui: () =>
-			                          {
-			                          }, 
-			                          onClickedRefresh: () =>
-			                          {
-				                          library.Reload();
-			                          },
-			                          onClickedHelp: () =>
-			                          {
-				                          Application.OpenURL(DocsPageHelper.GetUnityDocsPageUrl("unity/samples/lightbeam/", EditorConstants.UNITY_CURRENT_DOCS_VERSION));
-			                          });
-		}
 	}
 }

package/Editor/UI/LibraryWindow/BeamLibraryWindow_Samples.cs

@@ -1,5 +1,6 @@
 using Beamable.Editor.Util;
 using System.Collections.Generic;
+using TMPro;
 using UnityEditor;
 using UnityEditor.Experimental;
 using UnityEngine;
@@ -38,67 +39,116 @@ namespace Beamable.Editor.Library
 				margin = new RectOffset(12, 12, 12, 12)
 			});
 
+			// Header: welcome title and subtext
+			{
+				var headerStyle = new GUIStyle(EditorStyles.largeLabel)
+				{
+					fontStyle = FontStyle.Bold,
+					fontSize = 25,
+					wordWrap = true,
+					alignment = TextAnchor.UpperLeft,
+					margin = new RectOffset(2, 2, 4, 0),
+					padding = new RectOffset(2, 2, 0, 0)
+				};
+
+				var subStyle = new GUIStyle(EditorStyles.label)
+				{
+					wordWrap = true,
+					richText = false,
+					fontSize = 12,
+					alignment = TextAnchor.UpperLeft,
+					margin = new RectOffset(2, 2, 0, 8),
+					padding = new RectOffset(2, 2, 0, 0)
+				};
+
+				const string titleText = "Welcome to the Lightbeam Samples";
+				const string subText = "This section has ready-to-use samples covering features such as Player Accounts, Inventory, Cloud Saving, Friends, Lobbies, and more. Explore them to accelerate your integration with Beamable.";
+
+				var headerHeight = headerStyle.CalcHeight(new GUIContent(titleText), width);
+				var subHeight    = subStyle.CalcHeight(new GUIContent(subText), width);
+
+				EditorGUILayout.LabelField(titleText, headerStyle, GUILayout.Height(headerHeight));
+				EditorGUILayout.LabelField(subText, subStyle, GUILayout.Height(subHeight));
+
+				EditorGUILayout.BeginHorizontal();
+				if (EditorGUILayout.LinkButton("Visit our documentation website →"))
+				{
+					library.OpenDocumentation("unity/samples/lightbeam/");
+				}
+				GUILayout.FlexibleSpace();
+				EditorGUILayout.EndHorizontal();
+
+				EditorGUILayout.Space(8);
+			}
+			
+			// Add Sample Cards
 			var count = library.lightbeams.Count;
 			var widthPerCard = Mathf.Clamp(width / count, minWidth, maxWidth);
 			var cardsPerRow = Mathf.FloorToInt(width / widthPerCard);
 			widthPerCard = Mathf.Min(maxWidth, width / cardsPerRow);
 			var heightPerCard = Mathf.Clamp(widthPerCard, minHeight, maxHeight);
-			var rows = Mathf.CeilToInt(count / (float)cardsPerRow);
-
+			var rows = Mathf.Max(Mathf.CeilToInt(count / (float)cardsPerRow),0);
 			
 			var xOffset = (width * .5f) - (widthPerCard * .5f * cardsPerRow); // center the cards
 			var index = 0;
 			var cardRects = new List<Rect>();
-
-			{ // layout the rects
-				for (var r = 0; r < rows && index < library.lightbeams.Count; r++)
+			
+			// Add guard for minimun screen width
+			if (rows > 0)
+			{
 				{
-					EditorGUILayout.BeginHorizontal();
-					for (var c = 0; c < cardsPerRow && index < library.lightbeams.Count; c++, index++)
+					// layout the rects
+					for (var r = 0; r < rows && index < library.lightbeams.Count; r++)
 					{
-
-						var rect = GUILayoutUtility.GetRect(GUIContent.none, GUIStyle.none,
-						                                    GUILayout.Width(widthPerCard),
-						                                    GUILayout.Height(heightPerCard),
-						                                    GUILayout.ExpandWidth(false));
-
-						int padding = 8;
-						var padded = new Rect(rect.x + padding + xOffset, rect.y + padding, rect.width - padding * 2,
-						                      rect.height - padding * 2);
-						cardRects.Add(padded);
+						EditorGUILayout.BeginHorizontal();
+						for (var c = 0; c < cardsPerRow && index < library.lightbeams.Count; c++, index++)
+						{
+
+							var rect = GUILayoutUtility.GetRect(GUIContent.none, GUIStyle.none,
+							                                    GUILayout.Width(widthPerCard),
+							                                    GUILayout.Height(heightPerCard),
+							                                    GUILayout.ExpandWidth(false));
+
+							int padding = 8;
+							var padded = new Rect(rect.x + padding + xOffset, rect.y + padding,
+							                      rect.width - padding * 2,
+							                      rect.height - padding * 2);
+							cardRects.Add(padded);
+						}
+
+						EditorGUILayout.EndHorizontal();
 					}
-
-					EditorGUILayout.EndHorizontal();
 				}
-			}
 
-			{ // draw drop shadow
-				for (var i = 0; i < library.lightbeams.Count; i++)
 				{
-					var rect = cardRects[i];
-					
-					var shadowOffset = 24;
-					var shadowRect = new Rect(rect.x - shadowOffset, rect.y + shadowOffset, rect.width, rect.height);
-					GUI.DrawTexture(shadowRect, BeamGUI.iconShadowSoftA, ScaleMode.StretchToFill, true);
-					
-					shadowOffset = 6;
-					shadowRect = new Rect(rect.x - shadowOffset, rect.y + shadowOffset, rect.width, rect.height);
-					GUI.DrawTexture(shadowRect, BeamGUI.iconShadowSoftA, ScaleMode.StretchToFill, true);
+					// draw drop shadow
+					for (var i = 0; i < library.lightbeams.Count; i++)
+					{
+						var rect = cardRects[i];
+
+						var shadowOffset = 24;
+						var shadowRect = new Rect(rect.x - shadowOffset, rect.y + shadowOffset, rect.width,
+						                          rect.height);
+						GUI.DrawTexture(shadowRect, BeamGUI.iconShadowSoftA, ScaleMode.StretchToFill, true);
+
+						shadowOffset = 6;
+						shadowRect = new Rect(rect.x - shadowOffset, rect.y + shadowOffset, rect.width, rect.height);
+						GUI.DrawTexture(shadowRect, BeamGUI.iconShadowSoftA, ScaleMode.StretchToFill, true);
+					}
 				}
-			}
 
-			{ // draw the actual card content
-				for (var i = 0; i < library.lightbeams.Count; i++)
 				{
-					var rect = cardRects[i];
-					DrawSample(rect, library.lightbeams[i]);
+					// draw the actual card content
+					for (var i = 0; i < library.lightbeams.Count; i++)
+					{
+						var rect = cardRects[i];
+						DrawSample(rect, library.lightbeams[i]);
+					}
 				}
 			}
 
 			EditorGUILayout.EndVertical();
 			EditorGUILayout.EndScrollView();
-			
-			
 		}
 
 		private Material iconMaterial;
@@ -262,6 +312,16 @@ namespace Beamable.Editor.Library
 			{
 				AddDelayedAction(() =>
 				{
+					
+						// Search for the TMP Settings asset which is part of the Essential Resources
+						// Use this to detect if the TMP Pro Resources was imported already
+						string[] guid = AssetDatabase.FindAssets("t:TMP_Settings");
+						if (guid.Length == 0)
+						{
+							TMP_PackageResourceImporter.ImportResources(true,false,false);
+							Debug.Log("TMP Pro Resources Imported");
+						}
+					
 					library.OpenSample(lightBeam);
 				});
 			}