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

Xstream 112 edit new format attribut color #298

Merged
merged 16 commits into from
Aug 21, 2023
Merged

Xstream 112 edit new format attribut color #298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f8bca3b
Add color translation
Kekelgrs Aug 10, 2023
6b53644
Update schema
Kekelgrs Aug 10, 2023
9166e84
add generic attribut format color
Kekelgrs Aug 10, 2023
56b51c0
Add new ColorInput
Kekelgrs Aug 10, 2023
753e745
Update color display in library item list table
Kekelgrs Aug 10, 2023
0be7a49
Add tag for color attribut & update font color with background-color
Kekelgrs Aug 10, 2023
92acd0a
Update color input
Kekelgrs Aug 10, 2023
1e89a93
Update StandardField test for new format color Attribut
Kekelgrs Aug 11, 2023
c4938ba
Update antd version to 5.8.3
Kekelgrs Aug 16, 2023
c77146e
Fix lint error
Kekelgrs Aug 16, 2023
aaee54a
Fix issue on select with aria-label related to antd@5.8.3
Kekelgrs Aug 17, 2023
5abc365
Update variable name
Kekelgrs Aug 17, 2023
44f67de
Fix file format
Kekelgrs Aug 18, 2023
76a5765
Fix comment and update method to display color tag
Kekelgrs Aug 18, 2023
2644fef
Fix css + fix test
Kekelgrs Aug 21, 2023
5741318
Fix last comment + run lint command
Kekelgrs Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions .../src/components/LibraryItemsList/LibraryItemsListTable/Cell/StandardCell/StandardCell.tsx
View file
Open in desktop
Kekelgrs marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,17 @@ function StandardCell({cellData, values}: ISimpleCellProps): JSX.Element {
);
case AttributeFormat.color:
if(!isEmpty(displayedValues)){
const colorHexValue = "#" + displayedValues;
let tagStyle: React.CSSProperties;

const hexToRGB = (Values) => {
Values = '0x' + Values
const red = Values >> 16 & 0xFF
const green = Values >> 8 & 0xFF
const blue = Values & 0xFF
tagStyle = ((red*0.299 + green*0.587 + blue*0.114) > 186 ) ? {
color:"black"
} : {
color:"white"
};
return tagStyle;
const colorHexValue = "#" + displayedValues;

const hexToRGB = (values : string) => {
const red = parseInt(values.slice(1, 3), 16);
const green = parseInt(values.slice(3, 5), 16);
const blue = parseInt(values.slice(5, 7), 16);
return (red*0.299 + green*0.587 + blue*0.114) > 186 ? { color:"black"} : { color:"white" };
Kekelgrs marked this conversation as resolved.
Show resolved Hide resolved
}

return (
<Tag bordered={true} color={colorHexValue} style={hexToRGB(displayedValues)}>{colorHexValue}</Tag>
<Tag bordered={true} color={colorHexValue} style={hexToRGB(colorHexValue)}>{colorHexValue}</Tag>
);
}
else{
Expand Down
2 changes: 1 addition & 1 deletion ...cordEdition/EditRecord/uiElements/StandardField/StandardFieldValue/StandardFieldValue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function StandardFieldValue({
const _getInput = (): JSX.Element => {
if (!fieldValue.isEditing && attribute.format !== AttributeFormat.boolean) {
let displayedValue = String(fieldValue.displayValue);
if(attribute.format == AttributeFormat.color && (fieldValue.value == null || fieldValue.value.value == null)){
if(attribute.format === AttributeFormat.color && (fieldValue.value === null || fieldValue.value.value === null)){
fieldValue.value = null;
}
const hasValue = fieldValue.value !== null;
Expand Down