restore-file - Add support for new PR view
#8870
Merged
+71
−10
Conversation
This file contains hidden or 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
Fixes: refined-github#8714 - Added support for the new React-based PR files view - Keep legacy view handling unchanged - Use GitHubFileURL for URL parsing - Track focused file container via global variable for removal after discard - Use octicon library (GitCompareIcon) for the menu item icon - Handle renamed files by checking React props for RENAMED status 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
The menu is created fresh on each click, so items can't already exist. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
source/features/restore-file.tsx
Outdated
Comment on lines
107
to
127
| // New React view: get filenames from the View File link and React props | ||
| const fileAnchor = menuItem | ||
| .closest('ul')! | ||
| .querySelector<HTMLAnchorElement>('li:has(svg.octicon-eye) a')!; | ||
|
|
||
| const fileUrl = new GitHubFileURL(fileAnchor.href); | ||
| const newFileName = fileUrl.filePath; | ||
|
|
||
| // Check if the file was renamed by looking at the React props | ||
| const reactPropsElement = $('[data-target="react-app.embeddedData"]'); | ||
| const reactProps = JSON.parse(reactPropsElement.textContent); | ||
|
|
||
| const diffContents = reactProps.payload.diffContents.find( | ||
| (dc: {path: string}) => dc.path === newFileName, | ||
| ); | ||
|
|
||
| const originalFileName = diffContents?.status === 'RENAMED' | ||
| ? diffContents.oldTreeEntry.path | ||
| : newFileName; | ||
|
|
||
| return {original: originalFileName, new: newFileName}; |
Member
There was a problem hiding this comment.
You can do:
const [originalFileName, newFileName = originalFileName] = $('.Link--primary span:not(.sr-only)', focusedFileContainer).textContent.split(' ')
Member
There was a problem hiding this comment.
The variant I previously suggested works only for renamed files and doesn't account for invisible LRM chars.
Here is a better one:
const fileNameElement = $('[class^="DiffFileHeader-module__file-name"]', focusedFileContainer);
const span = $optional('span:not(.sr-only)', fileNameElement);
const [originalFileName, newFileName = originalFileName] = (span ?? fileNameElement)
// eslint-disable-next-line unicorn/prefer-string-replace-all -- Invisible char
.textContent.split(' ').map(text => text.replaceAll(/\u200E/g, ''));Use focusedFileContainer to get filenames directly from the file header, matching the pattern used in the legacy view. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
source/features/restore-file.tsx
Outdated
|
|
||
| function getFilenames(menuItem: HTMLElement): {original: string; new: string} { | ||
| // Legacy view: get filenames from the data-path and Link--primary elements | ||
| // TODO: Drop in June 2026 |
Member
There was a problem hiding this comment.
This is probably premature. The policy is to keep support for removed UI for 6 months. The React-based view is still in preview and could remain there for a couple more months. The same applies to lines 133, 145, and 181.
source/features/restore-file.tsx
Outdated
Comment on lines
161
to
162
| focusedFileContainer = delegateTarget.closest('[class*="DiffFileHeader-module__diff-file-header"]')! | ||
| .parentElement!; |
Member
There was a problem hiding this comment.
You are selecting only a header
Suggested change
| focusedFileContainer = delegateTarget.closest('[class*="DiffFileHeader-module__diff-file-header"]')! | |
| .parentElement!; | |
| focusedFileContainer = delegateTarget.closest('div[id^="diff-"]')!; |
The React-based view is still in preview, so we shouldn't mark legacy code for removal yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Use DiffFileHeader-module__file-name selector - Use $optional for span to handle both renamed and non-renamed files - Strip invisible LRM characters from filenames 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Select the whole diff container (div[id^="diff-"]) instead of just the header, so the entire file diff is removed after discard. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
SunsetTechuila
approved these changes
Jan 15, 2026
Contributor
Author
|
@SunsetTechuila I was also able to follow the good instructions in https://github.com/refined-github/refined-github/wiki/Contributing to help me actually test this by the end. And I can confirm it's working! Thanks so much! |
Contributor
Author
|
@SunsetTechuila @fregante do I need to do anything to make it mergeable? 😆 I want this so badly it's my favorite feature of RG |
Member
Only wait a bit |
restore-file - Add support for new React viewrestore-file - Add support for new PR view
Member
|
Thanks @maschwenk! |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes
restore-filebroken in new GitHub PR File List view #8714Reimplementation of
restore-file- Add support for new PR Files #8749addressing the maintainer's feedback, trying to sidestep drama. In honesty I don't totally know how to test this.
Changes
GitHubFileURLhelper for URL parsing instead of manual regexfocusedFileContainer) for removal after discard operationGitCompareIcon) for the menu item iconRENAMEDstatus with the suggested conditional expressionhandleMenuOpeningpattern frommore-file-links.tsxfor adding menu itemsKey differences from previous PR
addLegacyMenuItem,observe) remains exactly as it wasGitHubFileURLinstead of manual string manipulationrestore-file.tsxwhere it belongs, returns{original, new}as suggestedTest URLs