Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Checkbox): stop unnecessary event delegation in checkbox #2077

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(Checkbox): stop unnecessary event delegation in checkbox #2077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f99f693
fix(Checkbox): stop unnecessary event delegation in checkbox
amandal97 Mar 12, 2024
3bc8823
fix: update test snapshots
amandal97 Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions packages/blade/src/components/Checkbox/Checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,18 @@ const _Checkbox: React.ForwardRefRenderFunction<BladeElementRef, CheckboxProps>
isNegative={_hasError}
/>
{children ? (
<SelectorTitle size={_size} isDisabled={_isDisabled}>
{children}
</SelectorTitle>
<BaseBox onClick={(e) => e.stopPropagation()}>
<SelectorTitle size={_size} isDisabled={_isDisabled}>
Comment on lines +244 to +245
Copy link
Member

Choose a reason for hiding this comment

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

Is it possible to have onClick on SelectorTitle itself instead of introducing a BaseBox wrapper?

{children}
</SelectorTitle>
</BaseBox>
) : null}
</BaseBox>
{showSupportingText ? (
<BaseBox marginLeft={isSmall ? 'spacing.6' : 'spacing.7'}>
<BaseBox
marginLeft={isSmall ? 'spacing.6' : 'spacing.7'}
onClick={(e) => e.stopPropagation()}
>
<SelectorSupportText id={ids?.helpTextId}>{helpText}</SelectorSupportText>
</BaseBox>
) : null}
Expand Down
1 change: 1 addition & 0 deletions packages/blade/src/components/Checkbox/CheckboxIcon/CheckboxIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ const CheckboxIcon = ({
isDisabled={isDisabled}
isNegative={isNegative}
isChecked={!!(isChecked || isIndeterminate)}
onClick={(e) => e.stopPropagation()}
{...metaAttribute({ name: 'checkbox-icon-wrapper' })}
>
<Fade show={isIndeterminate} styles={{ position: 'absolute', display: 'flex' }}>
Expand Down
21 changes: 13 additions & 8 deletions packages/blade/src/components/Checkbox/__tests__/__snapshots__/Checkbox.ssr.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`<Checkbox /> should render checkbox with error validationState 1`] = `"<div id="root"><div data-blade-component="checkbox" class="BaseBox-bmPWx"><label data-blade-component="checkbox-label" class="SelectorLabelweb__StyledSelectorLabel-sc-1yoi09a-0 ehaOvX"><div data-blade-component="base-box" class="BaseBox-bmPWx fnwmJW"><div data-blade-component="base-box" class="BaseBox-bmPWx bFzCEy"><input type="checkbox" role="checkbox" aria-required="false" aria-invalid="true" aria-disabled="false" aria-checked="true" aria-errormessage="checkbox-undefined-errortext-undefined" class="SelectorInputweb__StyledInput-sc-1bnkrae-0 bJPbHG" checked=""/><div data-blade-component="checkbox-icon-wrapper" class="CheckboxIconWrapperweb__CheckboxIconWrapper-sc-3hpze0-0 lgvKoe"><div style="opacity:0;position:absolute;display:flex" class="Fadeweb__AnimatedFade-sc-1h424tv-0"><svg aria-hidden="true" data-blade-component="icon" height="12px" viewBox="0 0 8 8" width="12px" fill="none" class="Svgweb__StyledSvg-vcmjs8-0"><path d="M1.3335 3.99984C1.3335 3.81574 1.48273 3.6665 1.66683 3.6665H6.3335C6.51759 3.6665 6.66683 3.81574 6.66683 3.99984C6.66683 4.18393 6.51759 4.33317 6.3335 4.33317H1.66683C1.48273 4.33317 1.3335 4.18393 1.3335 3.99984Z" clip-rule="evenodd" fill="hsla(0, 0%, 100%, 1)" fill-rule="evenodd" stroke="hsla(0, 0%, 100%, 1)" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.5" data-blade-component="svg-path"></path></svg></div><div style="opacity:1;position:absolute;display:flex" class="Fadeweb__AnimatedFade-sc-1h424tv-0 klzUIs"><svg aria-hidden="true" data-blade-component="icon" height="12px" viewBox="0 0 8 8" width="12px" fill="none" class="Svgweb__StyledSvg-vcmjs8-0"><path d="M6.90237 1.76413C7.03254 1.89431 7.03254 2.10536 6.90237 2.23554L3.2357 5.90221C3.10553 6.03238 2.89447 6.03238 2.7643 5.90221L1.09763 4.23554C0.967456 4.10536 0.967456 3.89431 1.09763 3.76414C1.22781 3.63396 1.43886 3.63396 1.56904 3.76414L3 5.1951L6.43096 1.76413C6.56114 1.63396 6.77219 1.63396 6.90237 1.76413Z" clip-rule="evenodd" fill="hsla(0, 0%, 100%, 1)" fill-rule="evenodd" stroke="hsla(0, 0%, 100%, 1)" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.5" data-blade-component="svg-path"></path></svg></div></div><div data-blade-component="base-box" class="BaseBox-bmPWx CzMgf"></div><p class="StyledBaseText-dVBfTO cYIHIH" data-blade-component="text">Remember password</p></div></div></label><div id="checkbox-undefined-errortext-undefined" data-blade-component="base-box" class="BaseBox-bmPWx kzOBQv"><span style="word-break:break-all" data-blade-component="base-box" class="BaseBox-bmPWx fAEwZa"><svg aria-hidden="true" data-blade-component="icon" height="12px" viewBox="0 0 24 24" width="12px" fill="none" class="Svgweb__StyledSvg-vcmjs8-0"><path d="M12 11C12.5523 11 13 11.4477 13 12V16C13 16.5523 12.5523 17 12 17C11.4477 17 11 16.5523 11 16V12C11 11.4477 11.4477 11 12 11Z" fill="hsla(4, 74%, 49%, 1)" data-blade-component="svg-path"></path><path d="M12 7C11.4477 7 11 7.44772 11 8C11 8.55228 11.4477 9 12 9H12.01C12.5623 9 13.01 8.55228 13.01 8C13.01 7.44772 12.5623 7 12.01 7H12Z" fill="hsla(4, 74%, 49%, 1)" data-blade-component="svg-path"></path><path d="M1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12ZM12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3Z" clip-rule="evenodd" fill="hsla(4, 74%, 49%, 1)" fill-rule="evenodd" data-blade-component="svg-path"></path></svg><div data-blade-component="base-box" class="BaseBox-bmPWx eLBOzs"></div><span class="StyledBaseText-dVBfTO gvbiie" data-blade-component="text">This has to be checked</span></span></div></div></div>"`;
exports[`<Checkbox /> should render checkbox with error validationState 1`] = `"<div id="root"><div data-blade-component="checkbox" class="BaseBox-bmPWx"><label data-blade-component="checkbox-label" class="SelectorLabelweb__StyledSelectorLabel-sc-1yoi09a-0 ehaOvX"><div data-blade-component="base-box" class="BaseBox-bmPWx fnwmJW"><div data-blade-component="base-box" class="BaseBox-bmPWx bFzCEy"><input type="checkbox" role="checkbox" aria-required="false" aria-invalid="true" aria-disabled="false" aria-checked="true" aria-errormessage="checkbox-undefined-errortext-undefined" class="SelectorInputweb__StyledInput-sc-1bnkrae-0 bJPbHG" checked=""/><div data-blade-component="checkbox-icon-wrapper" class="CheckboxIconWrapperweb__CheckboxIconWrapper-sc-3hpze0-0 lgvKoe"><div style="opacity:0;position:absolute;display:flex" class="Fadeweb__AnimatedFade-sc-1h424tv-0"><svg aria-hidden="true" data-blade-component="icon" height="12px" viewBox="0 0 8 8" width="12px" fill="none" class="Svgweb__StyledSvg-vcmjs8-0"><path d="M1.3335 3.99984C1.3335 3.81574 1.48273 3.6665 1.66683 3.6665H6.3335C6.51759 3.6665 6.66683 3.81574 6.66683 3.99984C6.66683 4.18393 6.51759 4.33317 6.3335 4.33317H1.66683C1.48273 4.33317 1.3335 4.18393 1.3335 3.99984Z" clip-rule="evenodd" fill="hsla(0, 0%, 100%, 1)" fill-rule="evenodd" stroke="hsla(0, 0%, 100%, 1)" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.5" data-blade-component="svg-path"></path></svg></div><div style="opacity:1;position:absolute;display:flex" class="Fadeweb__AnimatedFade-sc-1h424tv-0 klzUIs"><svg aria-hidden="true" data-blade-component="icon" height="12px" viewBox="0 0 8 8" width="12px" fill="none" class="Svgweb__StyledSvg-vcmjs8-0"><path d="M6.90237 1.76413C7.03254 1.89431 7.03254 2.10536 6.90237 2.23554L3.2357 5.90221C3.10553 6.03238 2.89447 6.03238 2.7643 5.90221L1.09763 4.23554C0.967456 4.10536 0.967456 3.89431 1.09763 3.76414C1.22781 3.63396 1.43886 3.63396 1.56904 3.76414L3 5.1951L6.43096 1.76413C6.56114 1.63396 6.77219 1.63396 6.90237 1.76413Z" clip-rule="evenodd" fill="hsla(0, 0%, 100%, 1)" fill-rule="evenodd" stroke="hsla(0, 0%, 100%, 1)" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.5" data-blade-component="svg-path"></path></svg></div></div><div data-blade-component="base-box" class="BaseBox-bmPWx"><div data-blade-component="base-box" class="BaseBox-bmPWx CzMgf"></div><p class="StyledBaseText-dVBfTO cYIHIH" data-blade-component="text">Remember password</p></div></div></div></label><div id="checkbox-undefined-errortext-undefined" data-blade-component="base-box" class="BaseBox-bmPWx kzOBQv"><span style="word-break:break-all" data-blade-component="base-box" class="BaseBox-bmPWx fAEwZa"><svg aria-hidden="true" data-blade-component="icon" height="12px" viewBox="0 0 24 24" width="12px" fill="none" class="Svgweb__StyledSvg-vcmjs8-0"><path d="M12 11C12.5523 11 13 11.4477 13 12V16C13 16.5523 12.5523 17 12 17C11.4477 17 11 16.5523 11 16V12C11 11.4477 11.4477 11 12 11Z" fill="hsla(4, 74%, 49%, 1)" data-blade-component="svg-path"></path><path d="M12 7C11.4477 7 11 7.44772 11 8C11 8.55228 11.4477 9 12 9H12.01C12.5623 9 13.01 8.55228 13.01 8C13.01 7.44772 12.5623 7 12.01 7H12Z" fill="hsla(4, 74%, 49%, 1)" data-blade-component="svg-path"></path><path d="M1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12ZM12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3Z" clip-rule="evenodd" fill="hsla(4, 74%, 49%, 1)" fill-rule="evenodd" data-blade-component="svg-path"></path></svg><div data-blade-component="base-box" class="BaseBox-bmPWx eLBOzs"></div><span class="StyledBaseText-dVBfTO gvbiie" data-blade-component="text">This has to be checked</span></span></div></div></div>"`;

exports[`<Checkbox /> should render checkbox with error validationState 2`] = `
.c4.c4.c4.c4.c4 {
Expand Down Expand Up @@ -241,15 +241,20 @@ exports[`<Checkbox /> should render checkbox with error validationState 2`] = `
</div>
</div>
<div
class="c6"
class=""
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
Remember password
</p>
<div
class="c6"
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
Remember password
</p>
</div>
</div>
</div>
</label>
Expand Down
104 changes: 62 additions & 42 deletions packages/blade/src/components/Checkbox/__tests__/__snapshots__/Checkbox.web.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,34 +253,39 @@ exports[`<Checkbox /> should render checkbox with label 1`] = `
/>
</div>
<div
class="c6"
class=""
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
I accept
<a
aria-disabled="false"
class="c8"
data-blade-component="link"
href="#"
role="link"
<div
class="c6"
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
<span
class="c9 content-container"
data-blade-component="base-box"
I accept
<a
aria-disabled="false"
class="c8"
data-blade-component="link"
href="#"
role="link"
>
<span
class="c10"
data-blade-component="base-text"
class="c9 content-container"
data-blade-component="base-box"
>
Terms and Conditions
<span
class="c10"
data-blade-component="base-text"
>
Terms and Conditions
</span>
</span>
</span>
</a>
</p>
</a>
</p>
</div>
</div>
</div>
</label>
Expand Down Expand Up @@ -463,15 +468,20 @@ exports[`<Checkbox /> should set disabled state with isDisabled 1`] = `
/>
</div>
<div
class="c6"
class=""
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
Remember password
</p>
<div
class="c6"
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
Remember password
</p>
</div>
</div>
</div>
</label>
Expand Down Expand Up @@ -693,15 +703,20 @@ exports[`<Checkbox /> should set error state with validationState 1`] = `
/>
</div>
<div
class="c6"
class=""
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
Remember password
</p>
<div
class="c6"
data-blade-component="base-box"
/>
<p
class="c7"
data-blade-component="text"
>
Remember password
</p>
</div>
</div>
</div>
</label>
Expand Down Expand Up @@ -969,15 +984,20 @@ exports[`<Checkbox /> should set to indeterminate state of checkbox 1`] = `
</div>
</div>
<div
class="c7"
class=""
data-blade-component="base-box"
/>
<p
class="c8"
data-blade-component="text"
>
Remember password
</p>
<div
class="c7"
data-blade-component="base-box"
/>
<p
class="c8"
data-blade-component="text"
>
Remember password
</p>
</div>
</div>
</div>
</label>
Expand Down