(fix) Allow cancelling orders and address various small fixes #1899
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Size Change: -202 kB (-1.78%) Total Size: 11.1 MB
ℹ️ View Unchanged
|
denniskigen
reviewed
Jul 8, 2024
packages/esm-patient-orders-app/src/components/order-details-table.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-details-table.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
Show resolved
Hide resolved
| @@ -328,7 +329,7 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ title, patientUuid, sh | |||
| {showAddButton && ( | |||
| <Button | |||
| kind="ghost" | |||
| renderIcon={(props) => <Add size={16} {...props} />} | |||
| renderIcon={() => <AddIcon size={16} />} | |||
There was a problem hiding this comment.
Looks like there's a regression with the icon buttons:
There was a problem hiding this comment.
Aha! The props are important. I'll look into the color thing, but I think that's best fixed in the framework
packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
Outdated
Show resolved
Hide resolved
ibacher
force-pushed
the
fix/clean-up-orders-details-table
branch
from
8f5a22b to
7d31ac0
Compare
pirupius
reviewed
Jul 8, 2024
| } | ||
| } | ||
|
|
||
| .statusPill { |
| @@ -317,7 +318,7 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ title, patientUuid, sh | |||
| {showPrintButton && ( | |||
| <Button | |||
| kind="ghost" | |||
| renderIcon={(props) => <Printer size={16} {...props} />} | |||
| renderIcon={(props) => <PrinterIcon {...props} size={16} />} | |||
There was a problem hiding this comment.
Out of curiosity, is the design for iconography from the framework meant to inherit designs from the parent or do they need to be passed? for example in this case the Button stylings like color?
There was a problem hiding this comment.
They should inherit them, but I'm still untangling the mess of CSS to get things right. In this case, Carbon defines a selector like this:
.cds--btn--ghost:not([disabled]) svg {
fill: var(--cds-icon-primary, #161616);
}But also setting fill="currentColor" on the icon, so it effectively ignores the CSS. Originally, I was doing something similar too, but it caused issues with getting the color right in some other cases. I'm still fiddling with getting this working in all cases...
There was a problem hiding this comment.
The props here are basically passing in some additional padding and the iconDescription as an Aria label.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
This PR does various minor fixes to the order details table:
Screenshots
Related Issue
Other