ref(feedback): Refactor screenshot editor into multiple files - #15362

Merged
c298lee merged 6 commits into
developfrom
cl/ref-uf
Feb 12, 2025
Merged

ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom
cl/ref-uf

Conversation

@c298lee

@c298leec298lee commented Feb 10, 2025

Copy link
Copy Markdown
Contributor

We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar

@c298lee
c298lee requested a review from a team as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee requested a review from ryan953February 10, 2025 21:31
@github-actions

github-actionsBot commented Feb 10, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--

View base workflow run

ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);

@ryan953ryan953Feb 10, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?

@c298leec298leeFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing

@ryan953ryan953Feb 10, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too

@codecov

codecovBot commented Feb 10, 2025•
edited
Loading

Copy link
Copy Markdown

❌ 416 Tests Failed:

Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
setCroppingRect={setCroppingRect}
resize={resize}
/>
<Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />

@ryan953ryan953Feb 10, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change
<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}

same for options._experiments.annotations || action === 'crop' ? <Crop> : null

@c298leec298leeFeb 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(

ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 reviewed Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx Outdated
ryan953
ryan953 approved these changes Feb 10, 2025
View reviewed changes

@ryan953ryan953 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.

This works and is an improvement, so i'm all for 🚢

@c298lee
c298lee requested a review from billyvgFebruary 11, 2025 20:03
billyvg
billyvg approved these changes Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Comment on lines +101 to +103
if (action !== 'crop') {
return;
}

@billyvgbillyvgFeb 11, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?

@c298leec298leeFeb 11, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.

Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx Outdated
<button
class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
onClick={e => {
e.preventDefault();

@billyvgbillyvgFeb 11, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?

(you might need a type="button" if it's submitting a form)

@c298leec298leeFeb 11, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬

@c298lee
c298lee merged commit 5b665b8 into developFeb 12, 2025
@c298lee
c298lee deleted the cl/ref-uf branch February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ref(feedback): Refactor screenshot editor into multiple files - #15362
Merged
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Feb 12, 2025
Merged
ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Conversation
@c298lee
@c298leec298lee
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar
@c298lee
c298lee
requested a review
from a team
as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee
requested a review
from ryan953February 10, 2025 21:31
@github-actions
github-actionsBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
size-limit report 📦
PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--
View base workflow run
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
 const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
 const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
 const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too
@codecov
codecovBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

❌ 416 Tests Failed:
Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction
To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 setCroppingRect={setCroppingRect}
 resize={resize}
 />
 <Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />
@ryan953ryan953Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change

<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}
same for options._experiments.annotations || action === 'crop' ? <Crop> : null
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
approved these changes
Feb 10, 2025
View reviewed changes
@ryan953ryan953
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.
This works and is an improvement, so i'm all for 🚢
@c298lee
c298lee
requested a review
from billyvgFebruary 11, 2025 20:03
billyvg
billyvg
approved these changes
Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx

Comment on lines

+101
 to 
+103

 if (action !== 'crop') {
 return;
 }
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.
Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx
Outdated

 <button
 class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
 onClick={e => {
 e.preventDefault();
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?
(you might need a type="button" if it's submitting a form)
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬
@c298lee
c298lee
merged commit 5b665b8
into
developFeb 12, 2025
@c298lee
c298lee
deleted the

cl/ref-uf

branch
February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(feedback): Refactor screenshot editor into multiple files - #15362
Merged
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Feb 12, 2025
Merged
ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Conversation
@c298lee
@c298leec298lee
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar
@c298lee
c298lee
requested a review
from a team
as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee
requested a review
from ryan953February 10, 2025 21:31
@github-actions
github-actionsBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
size-limit report 📦
PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--
View base workflow run
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
 const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
 const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
 const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too
@codecov
codecovBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

❌ 416 Tests Failed:
Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction
To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 setCroppingRect={setCroppingRect}
 resize={resize}
 />
 <Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />
@ryan953ryan953Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change

<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}
same for options._experiments.annotations || action === 'crop' ? <Crop> : null
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
approved these changes
Feb 10, 2025
View reviewed changes
@ryan953ryan953
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.
This works and is an improvement, so i'm all for 🚢
@c298lee
c298lee
requested a review
from billyvgFebruary 11, 2025 20:03
billyvg
billyvg
approved these changes
Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx

Comment on lines

+101
 to 
+103

 if (action !== 'crop') {
 return;
 }
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.
Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx
Outdated

 <button
 class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
 onClick={e => {
 e.preventDefault();
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?
(you might need a type="button" if it's submitting a form)
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬
@c298lee
c298lee
merged commit 5b665b8
into
developFeb 12, 2025
@c298lee
c298lee
deleted the

cl/ref-uf

branch
February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(feedback): Refactor screenshot editor into multiple files - #15362
Merged
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Feb 12, 2025
Merged
ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Conversation
@c298lee
@c298leec298lee
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar
@c298lee
c298lee
requested a review
from a team
as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee
requested a review
from ryan953February 10, 2025 21:31
@github-actions
github-actionsBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
size-limit report 📦
PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--
View base workflow run
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
 const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
 const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
 const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too
@codecov
codecovBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

❌ 416 Tests Failed:
Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction
To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 setCroppingRect={setCroppingRect}
 resize={resize}
 />
 <Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />
@ryan953ryan953Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change

<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}
same for options._experiments.annotations || action === 'crop' ? <Crop> : null
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
approved these changes
Feb 10, 2025
View reviewed changes
@ryan953ryan953
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.
This works and is an improvement, so i'm all for 🚢
@c298lee
c298lee
requested a review
from billyvgFebruary 11, 2025 20:03
billyvg
billyvg
approved these changes
Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx

Comment on lines

+101
 to 
+103

 if (action !== 'crop') {
 return;
 }
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.
Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx
Outdated

 <button
 class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
 onClick={e => {
 e.preventDefault();
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?
(you might need a type="button" if it's submitting a form)
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬
@c298lee
c298lee
merged commit 5b665b8
into
developFeb 12, 2025
@c298lee
c298lee
deleted the

cl/ref-uf

branch
February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ref(feedback): Refactor screenshot editor into multiple files - #15362
Merged
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Feb 12, 2025
Merged
ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Conversation
@c298lee
@c298leec298lee
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar
@c298lee
c298lee
requested a review
from a team
as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee
requested a review
from ryan953February 10, 2025 21:31
@github-actions
github-actionsBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
size-limit report 📦
PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--
View base workflow run
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
 const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
 const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
 const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too
@codecov
codecovBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

❌ 416 Tests Failed:
Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction
To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 setCroppingRect={setCroppingRect}
 resize={resize}
 />
 <Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />
@ryan953ryan953Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change

<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}
same for options._experiments.annotations || action === 'crop' ? <Crop> : null
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
approved these changes
Feb 10, 2025
View reviewed changes
@ryan953ryan953
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.
This works and is an improvement, so i'm all for 🚢
@c298lee
c298lee
requested a review
from billyvgFebruary 11, 2025 20:03
billyvg
billyvg
approved these changes
Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx

Comment on lines

+101
 to 
+103

 if (action !== 'crop') {
 return;
 }
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.
Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx
Outdated

 <button
 class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
 onClick={e => {
 e.preventDefault();
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?
(you might need a type="button" if it's submitting a form)
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬
@c298lee
c298lee
merged commit 5b665b8
into
developFeb 12, 2025
@c298lee
c298lee
deleted the

cl/ref-uf

branch
February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(feedback): Refactor screenshot editor into multiple files - #15362
Merged
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Feb 12, 2025
Merged
ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Conversation
@c298lee
@c298leec298lee
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar
@c298lee
c298lee
requested a review
from a team
as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee
requested a review
from ryan953February 10, 2025 21:31
@github-actions
github-actionsBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
size-limit report 📦
PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--
View base workflow run
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
 const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
 const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
 const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too
@codecov
codecovBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

❌ 416 Tests Failed:
Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction
To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 setCroppingRect={setCroppingRect}
 resize={resize}
 />
 <Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />
@ryan953ryan953Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change

<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}
same for options._experiments.annotations || action === 'crop' ? <Crop> : null
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
approved these changes
Feb 10, 2025
View reviewed changes
@ryan953ryan953
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.
This works and is an improvement, so i'm all for 🚢
@c298lee
c298lee
requested a review
from billyvgFebruary 11, 2025 20:03
billyvg
billyvg
approved these changes
Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx

Comment on lines

+101
 to 
+103

 if (action !== 'crop') {
 return;
 }
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.
Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx
Outdated

 <button
 class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
 onClick={e => {
 e.preventDefault();
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?
(you might need a type="button" if it's submitting a form)
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬
@c298lee
c298lee
merged commit 5b665b8
into
developFeb 12, 2025
@c298lee
c298lee
deleted the

cl/ref-uf

branch
February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(feedback): Refactor screenshot editor into multiple files - #15362
Merged
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Feb 12, 2025
Merged
ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Conversation
@c298lee
@c298leec298lee
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar
@c298lee
c298lee
requested a review
from a team
as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee
requested a review
from ryan953February 10, 2025 21:31
@github-actions
github-actionsBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
size-limit report 📦
PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--
View base workflow run
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
 const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
 const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
 const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too
@codecov
codecovBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

❌ 416 Tests Failed:
Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction
To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 setCroppingRect={setCroppingRect}
 resize={resize}
 />
 <Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />
@ryan953ryan953Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change

<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}
same for options._experiments.annotations || action === 'crop' ? <Crop> : null
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
approved these changes
Feb 10, 2025
View reviewed changes
@ryan953ryan953
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.
This works and is an improvement, so i'm all for 🚢
@c298lee
c298lee
requested a review
from billyvgFebruary 11, 2025 20:03
billyvg
billyvg
approved these changes
Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx

Comment on lines

+101
 to 
+103

 if (action !== 'crop') {
 return;
 }
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.
Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx
Outdated

 <button
 class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
 onClick={e => {
 e.preventDefault();
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?
(you might need a type="button" if it's submitting a form)
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬
@c298lee
c298lee
merged commit 5b665b8
into
developFeb 12, 2025
@c298lee
c298lee
deleted the

cl/ref-uf

branch
February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ref(feedback): Refactor screenshot editor into multiple files - #15362
Merged
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Feb 12, 2025
Merged
ref(feedback): Refactor screenshot editor into multiple files#15362
c298lee merged 6 commits into
developfrom 
cl/ref-uf
Conversation
@c298lee
@c298leec298lee
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
We are splitting up screenshot editor into 3 additional parts: cropping, annotations, toolbar
@c298lee
c298lee
requested a review
from a team
as a code ownerFebruary 10, 2025 21:30
@c298lee
c298lee
requested a review
from ryan953February 10, 2025 21:31
@github-actions
github-actionsBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
size-limit report 📦
PathSize% ChangeChange
@sentry/browser22.95 KB--
@sentry/browser - with treeshaking flags22.73 KB--
@sentry/browser (incl. Tracing)35.88 KB--
@sentry/browser (incl. Tracing, Replay)72.88 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags66.38 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)77.13 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)90.04 KB+0.17%+150 B 🔺
@sentry/browser (incl. Feedback)40.06 KB+0.39%+157 B 🔺
@sentry/browser (incl. sendFeedback)27.58 KB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)32.38 KB+0.01%+2 B 🔺
@sentry/react24.78 KB--
@sentry/react (incl. Tracing)37.78 KB--
@sentry/vue27.14 KB--
@sentry/vue (incl. Tracing)37.59 KB--
@sentry/svelte22.99 KB--
CDN Bundle24.17 KB--
CDN Bundle (incl. Tracing)35.92 KB--
CDN Bundle (incl. Tracing, Replay)70.75 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)75.91 KB--
CDN Bundle - uncompressed70.64 KB--
CDN Bundle (incl. Tracing) - uncompressed106.73 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed217.95 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed230.51 KB--
@sentry/nextjs (client)38.75 KB--
@sentry/sveltekit (client)36.32 KB--
@sentry/node156.33 KB--
@sentry/node - without tracing97.31 KB-0.01%-2 B 🔽
@sentry/aws-serverless106.82 KB--
View base workflow run
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 const canvasContainerRef = hooks.useRef<HTMLDivElement>(null);
 const cropContainerRef = hooks.useRef<HTMLDivElement>(null);
 const croppingRef = hooks.useRef<HTMLCanvasElement>(null);
 const annotatingRef = hooks.useRef<HTMLCanvasElement>(null);
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this useRef call was just inside Annotations.tsx?
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in screenshot editor when resizing
@ryan953ryan953Feb 10, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh i missed that. i'll take another look. it's a non-blocking kind of thing too
@codecov
codecovBot
commented
Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

❌ 416 Tests Failed:
Tests completedFailedPassedSkipped
22824161866302
View the top 3 failed test(s) by shortest run time
tracing/metrics/handlers-lcp/test.tsshouldcapturemetricsforLCPinstrumentationhandlers
Stack Traces | 0.002s run time
test.ts:10:11shouldcapturemetricsforLCPinstrumentationhandlers
tracing/metrics/web-vitals/test.tspaintwebvitalsvaluesaregreaterthanTTFB
Stack Traces | 0.002s run time
test.ts:15:11paintwebvitalsvaluesaregreaterthanTTFB
tracing/metrics/pageload-browser-spans/test.tsshouldaddbrowser-relatedspanstopageloadtransaction
Stack Traces | 0.003s run time
test.ts:7:11shouldaddbrowser-relatedspanstopageloadtransaction
To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/ScreenshotEditor.tsx
 setCroppingRect={setCroppingRect}
 resize={resize}
 />
 <Annotations action={action} imageBuffer={imageBuffer} annotatingRef={annotatingRef} />
@ryan953ryan953Feb 10, 2025•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work if this was like:

Suggested change

<Annotationsaction={action}imageBuffer={imageBuffer}annotatingRef={annotatingRef}/>
{action==='annotate' ? <AnnotationsimageBuffer={imageBuffer}annotatingRef={annotatingRef}/> : null}
same for options._experiments.annotations || action === 'crop' ? <Crop> : null
@c298leec298leeFeb 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it does not :(
ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
reviewed
Feb 10, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx
Outdated

ryan953
ryan953
approved these changes
Feb 10, 2025
View reviewed changes
@ryan953ryan953
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

splitting into multiple files is a big help. We could probably do something about the number of props, but i'd need too look more closely first.
This works and is an improvement, so i'm all for 🚢
@c298lee
c298lee
requested a review
from billyvgFebruary 11, 2025 20:03
billyvg
billyvg
approved these changes
Feb 11, 2025
View reviewed changes
Comment threadpackages/feedback/src/screenshot/components/Crop.tsx

Comment on lines

+101
 to 
+103

 if (action !== 'crop') {
 return;
 }
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When/why would this component get a non crop action?
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's in a useEffect with action as a dependency. This is done so that when you switch from cropping to the annotation tool, the above part of the code will run and clear the rectangle drawn around the image.
Comment threadpackages/feedback/src/screenshot/components/Toolbar.tsx
Outdated

 <button
 class={`editor__tool ${action === 'crop' ? 'editor__tool--active' : ''}`}
 onClick={e => {
 e.preventDefault();
@billyvgbillyvgFeb 11, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the default behavior that this stops?
(you might need a type="button" if it's submitting a form)
@c298leec298leeFeb 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is submitting the form 😬
@c298lee
c298lee
merged commit 5b665b8
into
developFeb 12, 2025
@c298lee
c298lee
deleted the

cl/ref-uf

branch
February 12, 2025 16:16
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@billyvgbillyvgbillyvg approved these changes
@ryan953ryan953ryan953 approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@c298lee@billyvg@ryan953