rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-21 05:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved string diff viewer (#994)

Browse Source
This commit is contained in:
boatbomber
2025-11-18 20:26:44 -08:00
committed by GitHub
parent 31ec216a95
commit 071b6e7e23
8 changed files with 705 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/src/App/StatusPages/Confirming.lua
View File

@@ -23,8 +23,8 @@ function ConfirmingPage:init()
self:setState({
showingStringDiff = false,
oldString = "",
newString = "",
currentString = "",
incomingString = "",
showingTableDiff = false,
oldTable = {},
newTable = {},
@@ -56,11 +56,11 @@ function ConfirmingPage:render()
patchTree = self.props.patchTree,
showStringDiff = function(oldString: string, newString: string)
showStringDiff = function(currentString: string, incomingString: string)
self:setState({
showingStringDiff = true,
oldString = oldString,
newString = newString,
currentString = currentString,
incomingString = incomingString,
})
end,
showTableDiff = function(oldTable: { [any]: any? }, newTable: { [any]: any? })
@@ -167,8 +167,8 @@ function ConfirmingPage:render()
anchorPoint = Vector2.new(0, 0),
transparency = self.props.transparency,
oldString = self.state.oldString,
newString = self.state.newString,
currentString = self.state.currentString,
incomingString = self.state.incomingString,
}),
}),
}),

14
plugin/src/App/StatusPages/Connected.lua
View File

@@ -307,8 +307,8 @@ function ConnectedPage:init()
renderChanges = false,
hoveringChangeInfo = false,
showingStringDiff = false,
oldString = "",
newString = "",
currentString = "",
incomingString = "",
})
self.changeInfoText, self.setChangeInfoText = Roact.createBinding("")
@@ -511,11 +511,11 @@ function ConnectedPage:render()
patchData = self.props.patchData,
patchTree = self.props.patchTree,
serveSession = self.props.serveSession,
showStringDiff = function(oldString: string, newString: string)
showStringDiff = function(currentString: string, incomingString: string)
self:setState({
showingStringDiff = true,
oldString = oldString,
newString = newString,
currentString = currentString,
incomingString = incomingString,
})
end,
showTableDiff = function(oldTable: { [any]: any? }, newTable: { [any]: any? })
@@ -566,8 +566,8 @@ function ConnectedPage:render()
anchorPoint = Vector2.new(0, 0),
transparency = self.props.transparency,
oldString = self.state.oldString,
newString = self.state.newString,
currentString = self.state.currentString,
incomingString = self.state.incomingString,
}),
}),
}),