Skip to content

implement dynamic color addition for node/edge labels #67

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

Open
m-faseeh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

implement dynamic color addition for node/edge labels #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions backend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24,329 changes: 18,196 additions & 6,133 deletions frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-bootstrap": "^1.4.3",
"react-colorful": "^5.6.1",
"react-cookies": "^0.1.1",
"react-cytoscapejs": "^1.2.1",
"react-dom": "^17.0.1",
Expand Down
178 changes: 131 additions & 47 deletions frontend/src/components/cytoscape/CypherResultCytoscapeFooter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,24 @@ import PropTypes from 'prop-types';
import { Badge } from 'react-bootstrap';
import uuid from 'react-uuid';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faAngleDown, faAngleUp } from '@fortawesome/free-solid-svg-icons';
import { faAngleDown, faAngleUp, faPlus } from '@fortawesome/free-solid-svg-icons';
import { useTranslation } from 'react-i18next';
import { HexColorPicker } from 'react-colorful';

import {
updateEdgeLabelSize,
updateLabelCaption,
updateLabelColor,
updateNodeLabelSize,
} from '../../features/cypher/CypherUtil';
import useDynamicColors from '../../features/cypher/DynamicColorUtils';
import CytoscapeLayoutDropdown from './CytoscapeLayoutDropdown';
import '../../features/cypher/ColorPicker.css';

const CypherResultCytoscapeFooter = ({
footerData,
edgeLabelColors,
nodeLabelColors,
// edgeLabelColors,
// nodeLabelColors,
nodeLabelSizes,
edgeLabelSizes,
colorChange,
Expand All @@ -46,6 +49,22 @@ const CypherResultCytoscapeFooter = ({
}) => {
const [footerExpanded, setFooterExpanded] = useState(false);
const { t } = useTranslation('cytoscape');
const [showColorPicker, setShowColorPicker] = useState(false);
const [newColor, setNewColor] = useState('#ffffff');

// local state to hold dynamic colors separately
const nodeColorsHook = useDynamicColors('node');
const edgeColorsHook = useDynamicColors('edge');

const addColor = (type) => {
if (type === 'node') {
nodeColorsHook.addColor(newColor); // pass the selected color
} else {
edgeColorsHook.addColor(newColor);
}
setShowColorPicker(false);
};

const extractData = (d) => {
const extractedData = [];
for (let i = 0; i < Object.entries(d).length; i += 1) {
Expand Down Expand Up @@ -183,36 +202,101 @@ const CypherResultCytoscapeFooter = ({
};
const generateColors = () => {
if (footerData.data.type === 'node') {
return nodeLabelColors.map((color) => (
<button
onClick={() => [
updateLabelColor(footerData.data.type, footerData.data.label, color),
colorChange(footerData.data.type, footerData.data.label, color)]}
key={uuid()}
type="button"
className={`btn colorSelector ${footerData.data.backgroundColor === color.color ? ' selectedColor ' : ''}`}
style={{ backgroundColor: color.color }}
aria-label={t('footer.aria.changeNodeLabelColor')}
>
&nbsp;
</button>
));
return (
<>
{nodeColorsHook.colors.map((color) => (
<button
onClick={() => [
updateLabelColor(
footerData.data.type,
footerData.data.label,
color,
),
colorChange(footerData.data.type, footerData.data.label, color)]}
key={uuid()}
type="button"
className={`btn colorSelector ${
footerData.data.backgroundColor === color.color ? ' selectedColor ' : ''
}`}
style={{ backgroundColor: color.color }}
aria-label={t('footer.aria.changeNodeLabelColor')}
/>
))}

{/* + Button */}
<button
type="button"
className="btn colorSelector addColorBtn"
onClick={() => {
const nextState = !showColorPicker;
setShowColorPicker(nextState);
if (nextState) setFooterExpanded(true);
}}
>
<FontAwesomeIcon icon={faPlus} />
</button>

{showColorPicker && (
<div className="colorPickerWrapper">
<HexColorPicker color={newColor} onChange={setNewColor} />
<button
type="button"
onClick={() => addColor('node')}
className="btn btn-sm btn-primary mt-2"
>
Add
</button>
</div>
)}
</>
);
}

if (footerData.data.type === 'edge') {
return edgeLabelColors.map((color) => (
<button
onClick={() => [
updateLabelColor(footerData.data.type, footerData.data.label, color),
colorChange(footerData.data.type, footerData.data.label, color)]}
key={uuid()}
type="button"
className={`btn colorSelector ${footerData.data.backgroundColor === color.color ? ' selectedColor ' : ''}`}
style={{ backgroundColor: color.color }}
aria-label={t('footer.aria.changeEdgeLabelColor')}
>
&nbsp;
</button>
));
return (
<>
{edgeColorsHook.colors.map((color) => (
<button
onClick={() => [
updateLabelColor(footerData.data.type, footerData.data.label, color),
colorChange(footerData.data.type, footerData.data.label, color)]}
key={uuid()}
type="button"
className={`btn colorSelector ${
footerData.data.backgroundColor === color.color ? ' selectedColor ' : ''
}`}
style={{ backgroundColor: color.color }}
aria-label={t('footer.aria.changeEdgeLabelColor')}
/>
))}

{/* + Button */}
<button
type="button"
className="btn colorSelector addColorBtn"
onClick={() => {
const nextState = !showColorPicker;
setShowColorPicker(nextState);
if (nextState) setFooterExpanded(true);
}}
>
+
</button>

{showColorPicker && (
<div className="colorPickerWrapper">
<HexColorPicker color={newColor} onChange={setNewColor} />
<button
type="button"
onClick={() => addColor('edge')}
className="btn btn-sm btn-primary mt-2"
>
Add
</button>
</div>
)}
</>
);
}
return null;
};
Expand Down Expand Up @@ -319,22 +403,22 @@ CypherResultCytoscapeFooter.defaultProps = {
CypherResultCytoscapeFooter.propTypes = {
// eslint-disable-next-line react/forbid-prop-types
footerData: PropTypes.any.isRequired,
edgeLabelColors: PropTypes.arrayOf(PropTypes.shape({
color: PropTypes.string,
borderColor: PropTypes.string,
fontColor: PropTypes.string,
// eslint-disable-next-line react/forbid-prop-types
edgeLabels: PropTypes.any,
index: PropTypes.number,
})).isRequired,
nodeLabelColors: PropTypes.arrayOf(PropTypes.shape({
color: PropTypes.string,
borderColor: PropTypes.string,
fontColor: PropTypes.string,
// eslint-disable-next-line react/forbid-prop-types
nodeLabels: PropTypes.any,
index: PropTypes.number,
})).isRequired,
// edgeLabelColors: PropTypes.arrayOf(PropTypes.shape({
// color: PropTypes.string,
// borderColor: PropTypes.string,
// fontColor: PropTypes.string,
// // eslint-disable-next-line react/forbid-prop-types
// edgeLabels: PropTypes.any,
// index: PropTypes.number,
// })).isRequired,
// nodeLabelColors: PropTypes.arrayOf(PropTypes.shape({
// color: PropTypes.string,
// borderColor: PropTypes.string,
// fontColor: PropTypes.string,
// // eslint-disable-next-line react/forbid-prop-types
// nodeLabels: PropTypes.any,
// index: PropTypes.number,
// })).isRequired,
nodeLabelSizes: PropTypes.arrayOf(PropTypes.shape({
size: PropTypes.number,
// eslint-disable-next-line react/forbid-prop-types
Expand Down
78 changes: 78 additions & 0 deletions frontend/src/features/cypher/ColorPicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
.addColorBtn {
width: 15px;
height: 15px;
border-radius: 15px;
vertical-align: baseline;
color: #000000;
cursor: pointer;
padding: 6px 0;
font-size: 12px;
transition: all 0.2s ease;
}

.addColorBtn:hover {
color: rgb(0, 0, 0);
transform: scale(1.05);
}
/* .colorPickerWrapper {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
margin-top: 8px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
border-radius: 8px;
background: white;
border: 1px solid #ddd;
} */
.colorPickerWrapper {
display:flex;
flex-direction: column;
align-items: center;
margin:auto;
}
.colorPickerContent {
padding: 16px;
min-width: 200px;
}

.colorPickerActions {
display: flex;
justify-content: space-between;
margin-top: 12px;
gap: 8px;
}

.colorPickerActions .btn {
flex: 1;
}

/* Responsive adjustments */
/* @media (max-width: 768px) {
.colorPickerWrapper {
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
margin-top: 0;
}

.colorPickerContent {
min-width: 250px;
}
} */

/* Color picker library overrides */
.react-colorful {
width: 380px !important;
height: 380px !important;
}

.react-colorful__saturation {
border-radius: 4px 4px 0 0;
}

.react-colorful__hue {
border-radius: 0 0 4px 4px;
height: 20px;
}
Loading