diff --git a/plugin/src/App/Components/Header.lua b/plugin/src/App/Components/Header.lua index fa8c9173..0d640558 100644 --- a/plugin/src/App/Components/Header.lua +++ b/plugin/src/App/Components/Header.lua @@ -82,10 +82,11 @@ local function Header(props) }, { Logo = e("ImageLabel", { Image = Assets.Images.Logo, - ImageColor3 = theme.Header.LogoColor, + ImageColor3 = Color3.new(1, 1, 1), ImageTransparency = props.transparency, + ScaleType = Enum.ScaleType.Fit, - Size = UDim2.new(0, 60, 0, 27), + Size = UDim2.new(0, 122, 0, 27), LayoutOrder = 1, BackgroundTransparency = 1, diff --git a/plugin/src/App/Components/Notifications/FullscreenNotification.lua b/plugin/src/App/Components/Notifications/FullscreenNotification.lua index 47d0ae6f..79a4e31d 100644 --- a/plugin/src/App/Components/Notifications/FullscreenNotification.lua +++ b/plugin/src/App/Components/Notifications/FullscreenNotification.lua @@ -114,9 +114,10 @@ function FullscreenNotification:render() Logo = e("ImageLabel", { ImageTransparency = self.transparency, Image = Assets.Images.Logo, - ImageColor3 = theme.Header.LogoColor, + ImageColor3 = Color3.new(1, 1, 1), + ScaleType = Enum.ScaleType.Fit, BackgroundTransparency = 1, - Size = UDim2.fromOffset(60, 27), + Size = UDim2.fromOffset(122, 27), LayoutOrder = 1, }), Info = e("TextLabel", { diff --git a/plugin/src/App/Theme.lua b/plugin/src/App/Theme.lua index 919ed334..edfe31ea 100644 --- a/plugin/src/App/Theme.lua +++ b/plugin/src/App/Theme.lua @@ -23,7 +23,7 @@ local Roact = require(Packages.Roact) local strict = require(script.Parent.Parent.strict) -local BRAND_COLOR = Color3.fromHex("E13835") +local BRAND_COLOR = Color3.fromHex("335FFF") local Context = Roact.createContext({}) diff --git a/plugin/src/Assets.lua b/plugin/src/Assets.lua index b7a3a05a..f29c64d6 100644 --- a/plugin/src/Assets.lua +++ b/plugin/src/Assets.lua @@ -16,8 +16,8 @@ local Assets = { }, }, Images = { - Logo = "rbxassetid://129122178948447", - PluginButton = "rbxassetid://80862230817959", + Logo = "rbxassetid://72046454040382", + PluginButton = "rbxassetid://96993797296930", PluginButtonConnected = "rbxassetid://9529783993", PluginButtonWarning = "rbxassetid://9529784530", Icons = { diff --git a/plugin/src/Reconciler/reify.lua b/plugin/src/Reconciler/reify.lua index de7725ce..11840b54 100644 --- a/plugin/src/Reconciler/reify.lua +++ b/plugin/src/Reconciler/reify.lua @@ -2,7 +2,6 @@ "Reifies" a virtual DOM, constructing a real DOM with the same shape. ]] -local invariant = require(script.Parent.Parent.invariant) local PatchSet = require(script.Parent.Parent.PatchSet) local setProperty = require(script.Parent.setProperty) local decodeValue = require(script.Parent.decodeValue) @@ -13,6 +12,12 @@ local decodeValue = require(script.Parent.decodeValue) ]] local function addAllToPatch(patchSet, virtualInstances, id) local virtualInstance = virtualInstances[id] + + -- Skip instances that were excluded from the patch (e.g., ambiguous paths) + if virtualInstance == nil then + return + end + patchSet.added[id] = virtualInstance for _, childId in ipairs(virtualInstance.Children) do @@ -38,7 +43,11 @@ function reifyInstanceInner(unappliedPatch, deferredRefs, instanceMap, virtualIn local virtualInstance = virtualInstances[id] if virtualInstance == nil then - invariant("Cannot reify an instance not present in virtualInstances\nID: {}", id) + -- This instance was intentionally excluded from the patch (e.g., due to + -- ambiguous paths with duplicate-named siblings). Skip it gracefully + -- rather than throwing an error. The parent's Children array may still + -- reference this ID even though it wasn't included in the additions. + return end -- Instance.new can fail if we're passing in something that can't be