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.

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

[Timeline]: ProjectDemo with Timeline. #2355

Merged
merged 128 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
ed5140b
[Canvas]: from class components to FC.
Kuznietsov Jun 11, 2024
f73cbb0
[Timeline]: added timeline to ProjectDemo.
Kuznietsov Jun 12, 2024
63eea2d
[Timeline]: added detecting center and estimation marker.
Kuznietsov Jun 13, 2024
68a5f27
[Timeline]: added grid.
Kuznietsov Jun 13, 2024
4cdc2f3
[Timeline]: Added non-resizable header for timeline header cell.
Kuznietsov Jun 14, 2024
fd640e8
[Timeline]: simplified.
Kuznietsov Jun 14, 2024
25013fd
[Timeline]: more fixes.
Kuznietsov Jun 14, 2024
f803fda
[Timeline]: added setViewportRange.
Kuznietsov Jun 17, 2024
156e77d
Merge branch 'develop' into feature/timeline
Kuznietsov Jun 18, 2024
02b8f76
[Timeline]: added borders and teams are renamed to assignee.
Kuznietsov Jun 18, 2024
9695d87
[Timeline]: added scheduling (not finished yet).
Kuznietsov Jun 21, 2024
3853b57
[Timeline]: version with bug (extra adding estimation to prev parent …
Kuznietsov Jun 25, 2024
d54486e
[Timeline]: fixed bug with scheduling.
Kuznietsov Jun 26, 2024
99c807b
[Timeline]: added rescheduling.
Kuznietsov Jun 26, 2024
5f5740f
[Timeline]: data was added.
Kuznietsov Jun 26, 2024
9d842a3
[Timeline]: added debounce to estimate and fixed dueDate adjustment.
Kuznietsov Jun 27, 2024
28eb5b1
[Timeline]: added status subtotals.
Kuznietsov Jun 27, 2024
009848b
update qa env branch
AlekseyManetov Jun 27, 2024
11c894f
Merge remote-tracking branch 'origin/feature/timeline' into feature/t…
AlekseyManetov Jun 27, 2024
989e915
[Timeline]: fixed snapshots.
Kuznietsov Jun 27, 2024
9ca6dbb
Merge branch 'feature/timeline' of github.com:epam/UUI into feature/t…
Kuznietsov Jun 27, 2024
bd43298
[Timeline]: Added performance fixes.
Kuznietsov Jul 1, 2024
ef895e8
[Timeline]: more optimisations.
Kuznietsov Jul 2, 2024
ec54176
[ProjectTable]: Added transition.
Kuznietsov Jul 2, 2024
0998e73
[Timeline]: fixed grid update.
Kuznietsov Jul 2, 2024
f98c709
[Timeline]: added more optimisations.
Kuznietsov Jul 3, 2024
ebc8600
[Timeline]: refactored.
Kuznietsov Jul 3, 2024
529255a
[Timeline]: removed contextProvider.
Kuznietsov Jul 4, 2024
541d73a
[Timeline]: deadline added.
Kuznietsov Jul 5, 2024
3cc1870
[Timeline]: draft.
Kuznietsov Jul 8, 2024
39635ac
[Timeline]: more rework (fixed bugs/latency/etc).
Kuznietsov Jul 8, 2024
48f6756
[Timeline]: some refactoring.
Kuznietsov Jul 8, 2024
912f72b
[Timeline]: made smooth dragging and added text.
Kuznietsov Jul 9, 2024
94bc1ae
[Timeline]: some refactoring.
Kuznietsov Jul 9, 2024
fc92846
[Timeline]: added task summary.
Kuznietsov Jul 9, 2024
54cde2d
[Timeline]: removed unnecessary style.
Kuznietsov Jul 9, 2024
9027f4c
[Timeline]: save changes.
Kuznietsov Jul 9, 2024
368d336
[Timeline]: more refactoring.
Kuznietsov Jul 9, 2024
7f58a27
[Timeline]: more refactor.
Kuznietsov Jul 9, 2024
02ba6e2
[Timeline]: cleaned up code.
Kuznietsov Jul 9, 2024
5947954
[Timeline]: replaced assignee with task name.
Kuznietsov Jul 9, 2024
f325010
[Timeline]: fixed problem with dueDate.
Kuznietsov Jul 9, 2024
ef74989
[Timeline]: added deadlines and refactored.
Kuznietsov Jul 10, 2024
9731a00
[Timeline]: some more changes.
Kuznietsov Jul 10, 2024
25ad078
[Timeline]: made TimelineGrid customisable.
Kuznietsov Jul 10, 2024
935e6e4
[Timeline]: made TimelineScale extendable (first glance).
Kuznietsov Jul 11, 2024
64a8418
[Timeline]: Added possibility to override getArrowIcon and getArrow.
Kuznietsov Jul 11, 2024
25f1de9
[Timeline]: added possibility to override different draw methods in t…
Kuznietsov Jul 11, 2024
6ec0e2a
[Timeline]: unified lines calculation.
Kuznietsov Jul 11, 2024
8588826
[Timeline]: customised colors.
Kuznietsov Jul 11, 2024
3acec03
[Timeline]: aligned types.
Kuznietsov Jul 11, 2024
c605615
[Timeline]: added draw customisation.
Kuznietsov Jul 11, 2024
5e09429
[Timeline]: fixed grid.
Kuznietsov Jul 16, 2024
e413263
[Timeline]: fixed custom drawToday.
Kuznietsov Jul 16, 2024
6474752
[Timeline]: small refactoring.
Kuznietsov Jul 16, 2024
72b4533
Merge branch 'develop' into feature/timeline
Kuznietsov Jul 17, 2024
df00936
[Timeline]: added ranges to lib.
Kuznietsov Jul 17, 2024
835ab62
[Timeline]: removed customisations and typos in column.
Kuznietsov Jul 17, 2024
494118d
[Timeline]: Canvas -> TimelineCanvas.
Kuznietsov Jul 17, 2024
7eaf701
[Timeline]: fixed Fit Content functionality.
Kuznietsov Jul 17, 2024
61790de
Merge branch 'develop' into feature/timeline
Kuznietsov Jul 19, 2024
913628c
[Timeline]: changed design of TimelineScale and TimelineGrid.
Kuznietsov Jul 19, 2024
d6a641d
[Timeline]: more alignments with design.
Kuznietsov Jul 22, 2024
652220b
[Timeline]: removed console.log.
Kuznietsov Jul 23, 2024
53a9718
[Timeline]: fixed calculations of border/cells/etc.
Kuznietsov Jul 23, 2024
b8ca3a1
[Timeline]: changed styles and colors.
Kuznietsov Jul 23, 2024
227db07
[Timeline]: added correct colors and patterns according to design.
Kuznietsov Jul 24, 2024
7f2ec43
[Timeline]: fixed math of deadlines/estimateTo/etc.
Kuznietsov Jul 24, 2024
a60d3a2
[Timeline]: fixed bugs and added logic of 'endOfDay' for estimated de…
Kuznietsov Jul 25, 2024
2806772
[Timeline]: refactored.
Kuznietsov Jul 25, 2024
3a3ff2d
[Timeline]: fixed disappearing today.
Kuznietsov Jul 25, 2024
c28b0a7
[Timeline]: fixed today bottom line margin.
Kuznietsov Jul 25, 2024
c449349
[Timeline]: fixed today line margins.
Kuznietsov Jul 25, 2024
a0f827d
[Timeline]: more styles fixed.
Kuznietsov Jul 25, 2024
a93bd3d
[Timeline]: fixed calc bugs and added border-radius: 3px.
Kuznietsov Jul 25, 2024
d9be3b9
[Timeline]: removed grid .
Kuznietsov Jul 25, 2024
b6f555b
[Timeline]: fixed bugs with deadline only.
Kuznietsov Jul 25, 2024
566a2e8
[Timeline]: Fit content button outline.
Kuznietsov Jul 26, 2024
e75d1c9
[Timeline]: customised tooltip.
Kuznietsov Jul 26, 2024
371859c
[Timeline]: grid lines customisation done.
Kuznietsov Jul 26, 2024
300bfbc
[Timeline]: added more customisations.
Kuznietsov Jul 26, 2024
421bbf1
[Timeline]: one more fix.
Kuznietsov Jul 26, 2024
69b247e
[Timeline]: fixed fonts.
Kuznietsov Jul 26, 2024
0521a5c
[Timeline]: one more fix.
Kuznietsov Jul 26, 2024
5def0d3
[Timeline]: added feature with gradient.
Kuznietsov Jul 26, 2024
4d5b85d
[Timeline]: more fixes.
Kuznietsov Jul 26, 2024
dadc4d6
[Timeline]: center items inside div.
Kuznietsov Jul 26, 2024
b97c230
Merge branch 'develop' into feature/timeline
Kuznietsov Jul 29, 2024
d1ff3d8
[Timeline]: fixed styles and demo data.
Kuznietsov Jul 29, 2024
f79cdb5
[Timeline]: refactoring.
Kuznietsov Jul 29, 2024
b1c4b5b
Merge branch 'develop' into feature/timeline
Kuznietsov Jul 29, 2024
272eaa6
[Timeline]: made it more useful.
Kuznietsov Jul 29, 2024
6719500
[Timeline]: fixed more bugs.
Kuznietsov Jul 29, 2024
520fc5d
[Timeline]: docs added.
Kuznietsov Jul 29, 2024
1912586
[Timeline]: added docs for useResizeObserver.
Kuznietsov Jul 29, 2024
74a9eb6
[Timeline]: DataTableTimelineHeaderCellProps docs added.
Kuznietsov Jul 29, 2024
e2a22cf
[Timeline]: added docs to patch.
Kuznietsov Jul 29, 2024
6f3825c
[Timeline]: added docs to patch.
Kuznietsov Jul 29, 2024
50ebf70
[Timeline]: added docs to eventHandlers.
Kuznietsov Jul 29, 2024
b347850
[Timeline]: fixed thresholds.
Kuznietsov Jul 29, 2024
e772dfd
Merge branch 'develop' into feature/timeline
Kuznietsov Jul 30, 2024
9289fe7
[Timeline]: fixed bug with measureText and font.
Kuznietsov Jul 31, 2024
4d72c9f
[Timeline]: added scroll to TimelineHeader.
Kuznietsov Jul 31, 2024
8ff1516
[Timeline]: Quoter -> Quarter
Kuznietsov Jul 31, 2024
e335028
[Timeline]: reverted scroll on header.
Kuznietsov Jul 31, 2024
dde15e9
[Timeline]: added optimisations.
Kuznietsov Jul 31, 2024
5d1f503
[Timeline]: DataTableTimelineHeaderCell -> DataTableCustomHeaderCell.
Kuznietsov Jul 31, 2024
4093310
[Timeline]: removed not used props.
Kuznietsov Jul 31, 2024
5f63983
[Timeline]: one more fix.
Kuznietsov Jul 31, 2024
6585044
Merge branch 'develop' into feature/timeline
Kuznietsov Aug 1, 2024
845356c
[Timeline]: DataTableCustomHeaderCell -> DataTableCellContainer.
Kuznietsov Aug 1, 2024
8a92834
[Timeline]: changed timelineTransform optimisation.
Kuznietsov Aug 1, 2024
fafe66b
[Timeline]: added docs to components.
Kuznietsov Aug 2, 2024
46eab2c
[Timeline]: patch -> applyPatch.
Kuznietsov Aug 2, 2024
fc63e23
[Timeline]: added changelog and more docs.
Kuznietsov Aug 2, 2024
c32eafe
[Timeline]: remove spaces and added docs.
Kuznietsov Aug 2, 2024
716c069
[Timeline]: reverted changes according to dnd eventHandlers.
Kuznietsov Aug 2, 2024
24ebf4a
[Timeline]: removed console.
Kuznietsov Aug 2, 2024
4e080e0
[Timeline]: added rawProps for DataTableCellContainer.
Kuznietsov Aug 2, 2024
968b1b6
[Timeline]: updated snapshot.
Kuznietsov Aug 2, 2024
96f7f2d
[Timeline]: made DnD working.
Kuznietsov Aug 2, 2024
f6d6216
[Timeline]: added comments.
Kuznietsov Aug 2, 2024
798d1d0
[Timeline]: cleaned up docs.
Kuznietsov Aug 5, 2024
30128e8
[Timeline]: changed docs a little bit.
Kuznietsov Aug 5, 2024
6ce832b
[Timeline]: more docs changes.
Kuznietsov Aug 5, 2024
a2d651f
[Timeline]: fixed a typo in docs.
Kuznietsov Aug 5, 2024
294e808
[Timeline]: more docs/changelog improvements.
Kuznietsov Aug 5, 2024
1d6fba9
[Timeline]: added margin-top.
Kuznietsov Aug 5, 2024
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
7 changes: 3 additions & 4 deletions app/src/demo/tables/editableTable/columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { Task, ColumnsProps } from './types';
import { resources, statuses, statusTags } from './demoData';
import React from 'react';
import { TextArea, PickerToggler, TextInput, DataTableCell, NumericInput, PickerInput,
DatePicker, DataPickerRow, PickerItem, IconContainer,
DataTableCustomHeaderCell } from '@epam/uui';
DatePicker, DataPickerRow, PickerItem, IconContainer, DataTableCellContainer } from '@epam/uui';
import { ArrayDataSource, DataColumnProps, DataQueryFilter, IEditableDebouncer, cx } from '@epam/uui-core';
import { ReactComponent as statusIcon } from '@epam/assets/icons/common/radio-point-10.svg';

Expand Down Expand Up @@ -383,9 +382,9 @@ export function getColumnsTimelineMode(columnsProps: ColumnsProps & { timelineCo
allowResizing: false,
renderHeaderCell(props) {
return (
<DataTableCustomHeaderCell { ...props }>
<DataTableCellContainer { ...props }>
<TimelineHeader timelineController={ timelineController } />
</DataTableCustomHeaderCell>
</DataTableCellContainer>
);
},
renderCell(props) {
Expand Down
36 changes: 36 additions & 0 deletions uui-components/src/table/DataTableCellContainer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import * as React from 'react';
import { cx, DataColumnProps, IHasCX, uuiDataTableHeaderCell } from '@epam/uui-core';
import { FlexCell } from '../layout';
import css from './DataTableCellContainer.module.scss';

/**
* Header cell props of DataTable with Timeline.
*/
export interface DataTableCellContainerProps extends IHasCX, React.PropsWithChildren {
/** DataColumnProps object for the column the cell is at */
column: DataColumnProps;
}

export function DataTableCellContainer(props: DataTableCellContainerProps) {
return (
<FlexCell
{ ...props.column }
minWidth={ props.column.width }
rawProps={ {
role: 'columnheader',
'aria-sort': 'none',
Kuznietsov marked this conversation as resolved.
Show resolved Hide resolved
} }
cx={
cx(
'uui-dt-vars',
uuiDataTableHeaderCell.uuiTableHeaderCell,
css.cell,
props.column.cx,
props.cx,
)
}
>
{ props.children }
</FlexCell>
);
}
30 changes: 0 additions & 30 deletions uui-components/src/table/DataTableCustomHeaderCell.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion uui-components/src/table/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ export * from './DataTableHeaderCell';
export * from './DataTableCell';
export * from './tableCellsSelection';
export * from './tableCellsFocus';
export * from './DataTableCustomHeaderCell';
export * from './DataTableCellContainer';
37 changes: 0 additions & 37 deletions uui/components/tables/DataTableCustomHeaderCell.tsx

This file was deleted.

1 change: 0 additions & 1 deletion uui/components/tables/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export * from './DataTableCell';
export * from './DataTableRow';
export * from './DataTableHeaderRow';
export * from './DataTableHeaderCell';
export * from './DataTableCustomHeaderCell';
export * from './DataTable';
export * from './DataRowsContainer';
export * from './columnsConfigurationModal';
Expand Down
3 changes: 3 additions & 0 deletions uui/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ export * from './components';
export * from './i18n';
export * from './helpers';
export * from './settings';

export type { DataTableCellContainerProps } from '@epam/uui-components';
export { DataTableCellContainer } from '@epam/uui-components';
Loading