Port TGUI react migration and fixes, Part 1 #342
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# About the pull request First round of refactors for TGUI-5 migration. Here all TGUI interfaces and components have been changed from .js to .jsx. This is to closer align us to the standards of tgstation. Within the components themselves there are no functional changes. Files of interest: - tgui/webpack.config.js - tgui/packages/tgui/routes.jsx - tgui/packages/tgui/interfaces/Filteriffic.jsx - tgui/packages/tgui/debug/KitchenSink.jsx The rest of the file changes should just be .js -> .jsx <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game Groundwork prep for TGUI 5 # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: refactor: tgui js components now jsx /:cl:
<!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> Round of upgrades and changes to support migration to React for tgui. By doing more smaller changes I hope it's easier to review and test. We want to migrate from infernojs to react. <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> :cl: refactor: upgraded root tgui files to typescript to closer align with tg refactor: upgraded typescript to 4.9.4 refactor: upgraded yarn to 3.3.1 refactor: upgraded a bunch of tgui tooling /:cl:
<!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> Switches TGUI from Inferno to React. Part 2 of the PR cmss13-devs/cmss13#5435 Based heavily on the work from: https://github.com/tgstation/tgstation/pull/80044/files React is a more suitable framework <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> :cl: refactor: switched from infernojs to react /:cl:
# About the pull request Fixes `.jsx` files not triggering a TGUI recompile in build.bat when they've been edited. Currently you need to manually run `yarn tgui:build` (or equivalent) to make any changes appear in-game. I double checked TG's version of this just to make sure I didn't miss something obvious, and it looks like they've only recently fixed this themselves: tgstation/tgstation#80630 # Explain why it's good for the game Editing a TGUI file should trigger a rebuild. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog Nothing player-facing.
# About the pull request <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> Fixed the issue for STUI locally. The issue appears have happened because infernojs and react deal with key management on iterators differently. By using the index for the iterator, rather than the entire log message, this seems to have resolved it. # Explain why it's good for the game Resolves cmss13-devs/cmss13#5557 # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: code: fixes sticky messages in STUI refactor: STUI is now a TSX component /:cl:
# About the pull request This PR is a followup to #5633 adding another guard to a handling of numbers this time in TGUI number input. # Explain why it's good for the game Numbers should be numbers. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  </details> # Changelog No player facing changes.
# About the pull request <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> Should fix bug in restricted input TGUI component. The number was being clamped on every input, which meant that applying a number of 30 into a range of 19-90, 3 would be bounded to 19 and then the 0 would make the value 190, being bounded to 90. This change performs the check on blur. # Explain why it's good for the game Fixes cmss13-devs/cmss13#5610 # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: code: rework logic of restrictedinput component to reduce checks /:cl:
# About the pull request This PR is a follow up to #5493 fixing the Medals Panel. Some reason Fragment is busted if you don't use a key? # Explain why it's good for the game Fixes  # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  </details> # Changelog :cl: Drathek ui: Fix broken admin Medals Panel /:cl: fixes #5768
# About the pull request
Fixes the search function of `tgui_input_list`, and also makes the
search bar automatically focus when toggled.
This was caused by the same issue as #5581.
# Explain why it's good for the game
Bugfix, and a little QOL thing.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>
('Teleport to Area' menu as an example, but it's the same on any
others.)
**Before:**
https://github.com/cmss13-devs/cmss13/assets/57483089/8450adef-38f4-4ae4-963a-11533a328841
**After:**
https://github.com/cmss13-devs/cmss13/assets/57483089/ede80ffa-7ce6-47c9-9711-a5f29560d1bd
</details>
# Changelog
:cl:
fix: Fixed the search function of TGUI input lists.
qol: Made the TGUI input list search bar automatically focus when
toggled.
/:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> Replaces tgui build tools with faster alternatives. There were some issues in build of components using hooks which do not exist, which I removed as well. This is not a required part of the PR but React does not use these Based on two PRs: [Esbuild](tgstation/tgstation#79916) [SWC](tgstation/tgstation#80310) <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> Faster build times <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding, and may discourage maintainers from reviewing or merging your PR. This section is not strictly required for (non-controversial) fix PRs or backend PRs. --> <!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. --> <!-- !! If you are modifying sprites, you **must** include one or more in-game screenshots or videos of the new sprites. !! --> <details> <summary>Screenshots & Videos</summary> Before  After  </details>
correcting mistakes in the merging process
…at the ground, instead of deleting it. (#5584) <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> Jumping out of a dropship heading towards an LZ now throws your body at the ground, instead of deleting it. This does around 500 damage, and permanently kills you.  These people falling out of the sky, can land anywhere where there is no ceiling (or a glass one). Basically anywhere you can mortar, medevac, or laze something. This only works if the dropship is heading towards one of the LZs, if not, then they're deleted like normal. I also fixed the throwing, so it doesn't appear like you're just standing in space for 0.5 seconds before being disappeared. I also removed some unused arguments in `take_overall_damage` and `take_overall_armored_damage`. It adds a bit of depth to the game, instead of your character being just outright deleted, their body actually ends up somewhere. <details> <summary>Screenshots & Videos</summary> https://github.com/cmss13-devs/cmss13/assets/91113370/a6df19dc-7f9f-4c8d-8169-2db1497b6c54 (It does play sounds when you land, you just cant really hear them in this clip because they died.)   https://github.com/cmss13-devs/cmss13/assets/91113370/f727b8f7-1df3-4725-bb82-f16dc8294eea (Items do a little bounce when they land too) </details> :cl: add: Falling out of a Dropship en route to an LZ, now lets your corpse plummet to the ground instead of being deleted. /:cl: --------- Co-authored-by: private-tristan <[email protected]>
never used, removal is a whole PR tangle of its own
…nsport (#5158) huh? how'd this not get reported? :cl: fix: xenos can construct in dropships during transport again /:cl:
Updates most of mapping backend to /tg/ current: * Replaces completely map reader which now has explicit TGM support * Replaces completely reservations backend, they now have a builtin "cordon" area around them * Grafts and updates some missing procs in SSmapping and Shuttles, notably for reservations * Updates nightmare, map templates, interiors, etc, to match new mapper/reservations code * Minor Turf/Atoms stuff such as global init, turf_flags rename, and AfterChange() This shouldn't change much to the game as is, but is meant as a stepping stone toward new features such as planecube that depend on updated mapping code, rather than having to messily strap them to old. Very Testmerge-worth - [x] General map loading of Ship & Ground - [x] Dropship loading and flight - [x] Fultons reservation launching - [x] Lifeboats launching - [x] Vehicle Interiors instanciation - [x] Interior reservations freeing - [x] Tents templates placement - [x] Nightmare inserts loading - [x] Other maps than LV-624 - [x] Maploading admin verbs - [x] Mass screenshot verb - [x] Runtime Trijent elevators working - [x] Find a better cordon turf than outer almayer hull, it looks ugly with eg fultons :cl: code: Updated mapping backend from /tg/ upstream. /:cl: --------- Co-authored-by: harryob <[email protected]> Co-authored-by: harryob <[email protected]>
# About the pull request Removes trimming from VV edits for strings. As a byproduct you can now provide the argument of `trim = FALSE` to `tgui_input_text()` to return untrimmed input. # Explain why it's good for the game VV editors shouldn't have the input box arbitrarily trim their leading or trailing whitespace from editing variables. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: code: Changing a string in VV no longer trims whitespace. /:cl:
This PR is a follow up to #5493 and ultimately is aimed at bringing us back into parity with TG's version of the TGUI components again. For the most part this PR is done via diffing TG's TGUI folder with ours. The PRs listed below are what I found in blames and I double checked to see what files if any they affected outside the TGUI folder. **It is recommended to close VSC and run bin/clean.cmd and then bin/build.cmd if you try out this branch**. You will be using the wrong node & prettier version otherwise. This at least partially ports these PRs (and likely many others - but these I explicitly checked for how they affected other files): - tgstation/tgstation#67935 - tgstation/tgstation#74638 - tgstation/tgstation#75029 - tgstation/tgstation#75431 - tgstation/tgstation#75463 - tgstation/tgstation#75534 - tgstation/tgstation#78879 - tgstation/tgstation#79322 - tgstation/tgstation#79895 - tgstation/tgstation#79898 - tgstation/tgstation#79974 - tgstation/tgstation#79991 - tgstation/tgstation#80044 - tgstation/tgstation#80057 - tgstation/tgstation#80189 - tgstation/tgstation#80304 - tgstation/tgstation#80430 - tgstation/tgstation#80453 - tgstation/tgstation#80454 - tgstation/tgstation#80920 - tgstation/tgstation#81354 - tgstation/tgstation#81381 - tgstation/tgstation#81495 - tgstation/tgstation#82334 - tgstation/tgstation#82377 - tgstation/tgstation#82385 - tgstation/tgstation#82417 - tgstation/tgstation#82420 - tgstation/tgstation#82527 - tgstation/tgstation#82571 - tgstation/tgstation#82792 - tgstation/tgstation#82854 - tgstation/tgstation#83098 - tgstation/tgstation#83096 - tgstation/tgstation#83218 Additionally it ports the new base components from: - tgstation/tgstation#71531 - tgstation/tgstation#71847 - tgstation/tgstation#74544 - tgstation/tgstation#74704 (just a fix to above) - tgstation/tgstation#80743 - tgstation/tgstation#82181 (just a fix to above) - tgstation/tgstation#82533 - tgstation/tgstation#83179 (just a fix to above) But these are missing documentation in the components readme, and we do not have any interface that utilizes them yet. I wanted to explicitly mention them separately so people can see what they can do. Changes I still intend to do in this PR or investigate: - [X] Fix Button.Confirm not properly handling clicks (Sort of stumped on this atm) - [X] Fix Relay Viewer buttons not always updating - [X] Port TGSay 1.1 & TextArea changes (tgstation/tgstation#75431) - [X] Fix ByondUI in Drop pod panel - [X] Check parity with TG again and port anything else that may have been done during the creation of this PR - [X] Find a way to prevent TGSay passthrough when hotkeying InputList (and maybe others)? tgstation/tgstation#75463 Other notable changes not directly related to the above ports, but done as I was fixing other problems: - Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same. - VOX panel's second tab now doesn't overlap the other buttons - Wiring panel from cmss13-devs/cmss13#1623 is now restored to use circular indicators again instead of the regression to ColorBox in cmss13-devs/cmss13#2641 - Smart fridge interface is more in line with sorted inventories as far as layout & tooltips - Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date) - Fixes runtimes when quickly switching between tgsay categories - Basically reverts cmss13-devs/cmss13#5651 in favor of how TG ended up solving it via tgstation/tgstation#81495 - Rolls back SWC to the version TG is currently using because of cmss13-devs/cmss13#6196 (comment) - Adds these commands from tgstation/tgstation#81381 though I also have it check jsx files that somereason TG doesn't do (needs to have been built once to function - just run build.bat):  - Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity. I left out one of the Cyrillic fixes since we shouldn't normally be handling Cyrillic anyways. - Ship manipulator window can now replace any existing shuttle and generally is polished up more than it was. - Ports TGSay 1.1 though I discarded basically all the layout changes they did. - TGUI modals can now accept a ui_state in case you want an alert for say a mob that might qdel while it is open. - Finishes porting the reservation changes to shuttles.dm from tgstation/tgstation#73261 that some reason were absent from cmss13-devs/cmss13#5165 - Fixes F5 refreshing a window if default is prevented (e.g. when the hotkey interface is waiting for a key press). - All depreciated useLocalState is now removed. In almost all situations I could useState, but a few things for MFD on CAS I needed to use sharedState. Prepares us for 516 (though still more changes will be necessary) and finalizes the react port. <details> <summary>Screenshots & Videos</summary> New list modal w/ duplicate key handling:  Fixed VOX panel (sound files used to overlap type select):  Updated shuttle manipulator window:    With replace any shuttle support:  Erase current tab chat history:  Working case sensitivity highlights:  Unread counter toggle per tab:  Larger strip panel:  Tacmap panel polish (button positioning + dropdown text color when highlighted):  Minor tweak to camera panel:  Dropdowns will now display above if too little space below:  Kitchen sink works again (F12 w/ tgui-dev):  Layout mode works again (F11 w/ tgui-dev):  New checkbox modal (with theme support):   New handling for button sizes in alert modals (stacked list since options wanted to use more horizontal space than limit):  Polished smart fridge + restore wiring panel:  Fixed byondui in supply pod menu:  TG Say:  Some unchanged panels (to just show working):                         </details> :cl: Drathek, mullenpaul ui: Finalizes the TGUI React port and brings us back into parity again with TG's interface components ui: Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same. ui: VOX panel's second tab now doesn't overlap the other buttons ui: Wiring panel for some machines is now restored to use circular indicators again ui: Smart fridge interface is more in line with sorted inventories as far as layout & tooltips ui: Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date) ui: Reworks RestrictedInput number handling ui: Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, and Checkbox TGUI components (but nothing uses them yet) ui: Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity ui: Updates the ship manipulator window to allow replacing any Shuttle ui: Fixes the supply pod panel not displaying its byondui map correctly ui: Fixes the research terminal duplicating papers in display old mode. ui: Updates the tgui_input_list to for new features like hotkey selection, duplicate key handling, etc fix: Fixes thinking runtimes when quickly switching between tgsay categories code: Shuttle subsystem now is less aggressive with reservations (skipping deletion if below a threshold, delaying reservation if above a threshold) fix: Fixes F5 key still refreshing a TGUI window even if default was set to be prevented (e.g. Hotkey interface) /:cl: --------- Co-authored-by: Jerm <[email protected]>
cas interface upgrade is a whole other can of worms
required to be found by route now
stop poddoor filler from pretending its a real door
convert to the new version
convert to the new version
…SS13 into port-tgui-part1 # Conflicts: # tgui/packages/tgui/interfaces/DemoSim.tsx
# About the pull request This PR is a followup to #5968 which made holocards more prominent. Now the holocards are tied to the squad hud. Changes to sprites are just to move the holocards into the dmi with the rest of the squad hud icons. # Explain why it's good for the game It is not super important that this overlay *always* be displayed, and especially not to xenos. Now it is as if your squad visor is identifying the person you are looking at. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> https://github.com/cmss13-devs/cmss13/assets/76988376/b4f0e369-a269-4678-9f17-69dafffe0848 </details> # Changelog :cl: Drathek add: Moved holocards to the squad hud /:cl: (cherry picked from commit ad5daf7)
Drulikar
reviewed
Jul 26, 2024
fixed obscured space tiles to noop, was preventing rear hatch from opening
were overflowing the window
filter out the filler_object directly
missing parenthesis
Drulikar
previously approved these changes
Jul 27, 2024
There was a problem hiding this comment.
Of note, a bulk of this is my own code so take my approval with a grain of salt. Feel free to let me know if you find anything that needs tweaking though. I will port most other tgui changes I think will be useful here once this is merged so don't be scared with a big PR influx.
paradrop system is now multi-use with rappels & extraction rappels
Drulikar
requested changes
Aug 1, 2024
some backend changes to normandy/alamo weren't added to PvE shuttles
|
Good catch. Tested and fixed for all PvE dropships. |
our GM's virtual phone stuff was just different enough from PvP's implementation to cause issues
Drulikar
requested changes
Aug 3, 2024
There was a problem hiding this comment.
All hardpoints look fixed and cas firing is fine.
Paradropping does not transition the person to the map however. It seems /turf/open/space/transit/proc/handle_crosser(atom/movable/crosser) is triggered but not /turf/open/space/transit/dropship/handle_crosser(atom/movable/crosser) so maybe the shuttles need further mapping changes to be more like pvp?
…at the ground, instead of deleting it. (#5584) <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> Jumping out of a dropship heading towards an LZ now throws your body at the ground, instead of deleting it. This does around 500 damage, and permanently kills you.  These people falling out of the sky, can land anywhere where there is no ceiling (or a glass one). Basically anywhere you can mortar, medevac, or laze something. This only works if the dropship is heading towards one of the LZs, if not, then they're deleted like normal. I also fixed the throwing, so it doesn't appear like you're just standing in space for 0.5 seconds before being disappeared. I also removed some unused arguments in `take_overall_damage` and `take_overall_armored_damage`. It adds a bit of depth to the game, instead of your character being just outright deleted, their body actually ends up somewhere. <details> <summary>Screenshots & Videos</summary> https://github.com/cmss13-devs/cmss13/assets/91113370/a6df19dc-7f9f-4c8d-8169-2db1497b6c54 (It does play sounds when you land, you just cant really hear them in this clip because they died.)   https://github.com/cmss13-devs/cmss13/assets/91113370/f727b8f7-1df3-4725-bb82-f16dc8294eea (Items do a little bounce when they land too) </details> :cl: add: Falling out of a Dropship en route to an LZ, now lets your corpse plummet to the ground instead of being deleted. /:cl: --------- Co-authored-by: private-tristan <[email protected]>
|
Good catch, and fixed! |
Drulikar
approved these changes
Aug 4, 2024
|
One full mission without any issues being noticed and I'll be satisfied. |
|
I'm satisfied. Those additional ports you mentioned earlier, did you intend to add those before or after this gets merged? |
Yes though some things have come up with my family and I need to move so I don't currently have time to do it this month or probably the next. If you want to take a stab at what I listed feel free, but those were the PRs that stood out to me that pve lacked and could use when diffing pve tgui folder against pvp's tgui folder. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
Ports various commits related to main CM's upgrade of TGUI:
.jsxfiles not triggering a TGUI recompile cmss13#5562Additionally several misc commits that TGUI upgrades depended on:
It boots, nothing looks obviously wrong. Beyond that, will need some serious testing. Changes that rely on changes that rely on changes that rely on changes -- I traced them back as best I could, but there's always a chance that some code change required to make these changes work got missed.
Assuming that all goes well, would check for any differences in TGUI files to ensure everything up-to-date with PvP.
Explain why it's good for the game
React is a much better supported framework than Inferno. Modern TGUI has performance and functionality improvements.
Testing Photographs and Procedure
Its too big. Gonna have to be testmerged.
Changelog
🆑
refactor: complete overhaul of just about every TGUI interface
add: added parachutes
add: added holocards to the squad hud
add: falling out a dropship throws you to the surface
/:cl: