Skip to content

fix : typing issues #4

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

Merged
merged 8 commits into from
Jun 18, 2025
Merged

fix : typing issues #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ae90e9
updated react and ts
mrrenaud Jun 17, 2025
7ecf219
added helpers method and wrapper components to calculate component wi…
mrrenaud Jun 17, 2025
f10bd21
use short format for month display
mrrenaud Jun 17, 2025
7fb53ea
updated package config
mrrenaud Jun 18, 2025
60747d4
Merge branch 'main' into feature/full-width-gantt
mrrenaud Jun 18, 2025
0f636e3
fix
mrrenaud Jun 18, 2025
a0194d6
Merge branch 'main' of https://github.com/sprkl/gantt-task-react
mrrenaud Jun 18, 2025
0dd66bd
Merge branch 'main' into feature/full-width-gantt
mrrenaud Jun 18, 2025
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
34 changes: 17 additions & 17 deletions src/components/calendar/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ReactChild } from "react";
import React, { ReactNode } from "react";
import { ViewMode } from "../../types/public-types";
import { TopPartOfCalendar } from "./top-part-of-calendar";
import {
Expand Down Expand Up @@ -33,8 +33,8 @@ export const Calendar: React.FC<CalendarProps> = ({
fontSize,
}) => {
const getCalendarValuesForYear = () => {
const topValues: ReactChild[] = [];
const bottomValues: ReactChild[] = [];
const topValues: ReactNode[] = [];
const bottomValues: ReactNode[] = [];
const topDefaultHeight = headerHeight * 0.5;
for (let i = 0; i < dateSetup.dates.length; i++) {
const date = dateSetup.dates[i];
Expand Down Expand Up @@ -77,8 +77,8 @@ export const Calendar: React.FC<CalendarProps> = ({
};

const getCalendarValuesForQuarterYear = () => {
const topValues: ReactChild[] = [];
const bottomValues: ReactChild[] = [];
const topValues: ReactNode[] = [];
const bottomValues: ReactNode[] = [];
const topDefaultHeight = headerHeight * 0.5;
for (let i = 0; i < dateSetup.dates.length; i++) {
const date = dateSetup.dates[i];
Expand Down Expand Up @@ -122,8 +122,8 @@ export const Calendar: React.FC<CalendarProps> = ({
};

const getCalendarValuesForMonth = () => {
const topValues: ReactChild[] = [];
const bottomValues: ReactChild[] = [];
const topValues: ReactNode[] = [];
const bottomValues: ReactNode[] = [];
const topDefaultHeight = headerHeight * 0.5;
for (let i = 0; i < dateSetup.dates.length; i++) {
const date = dateSetup.dates[i];
Expand Down Expand Up @@ -166,8 +166,8 @@ export const Calendar: React.FC<CalendarProps> = ({
};

const getCalendarValuesForWeek = () => {
const topValues: ReactChild[] = [];
const bottomValues: ReactChild[] = [];
const topValues: ReactNode[] = [];
const bottomValues: ReactNode[] = [];
let weeksCount: number = 1;
const topDefaultHeight = headerHeight * 0.5;
const dates = dateSetup.dates;
Expand Down Expand Up @@ -215,8 +215,8 @@ export const Calendar: React.FC<CalendarProps> = ({
};

const getCalendarValuesForDay = () => {
const topValues: ReactChild[] = [];
const bottomValues: ReactChild[] = [];
const topValues: ReactNode[] = [];
const bottomValues: ReactNode[] = [];
const topDefaultHeight = headerHeight * 0.5;
const dates = dateSetup.dates;
for (let i = 0; i < dates.length; i++) {
Expand Down Expand Up @@ -263,8 +263,8 @@ export const Calendar: React.FC<CalendarProps> = ({
};

const getCalendarValuesForPartOfDay = () => {
const topValues: ReactChild[] = [];
const bottomValues: ReactChild[] = [];
const topValues: ReactNode[] = [];
const bottomValues: ReactNode[] = [];
const ticks = viewMode === ViewMode.HalfDay ? 2 : 4;
const topDefaultHeight = headerHeight * 0.5;
const dates = dateSetup.dates;
Expand Down Expand Up @@ -309,8 +309,8 @@ export const Calendar: React.FC<CalendarProps> = ({
};

const getCalendarValuesForHour = () => {
const topValues: ReactChild[] = [];
const bottomValues: ReactChild[] = [];
const topValues: ReactNode[] = [];
const bottomValues: ReactNode[] = [];
const topDefaultHeight = headerHeight * 0.5;
const dates = dateSetup.dates;
for (let i = 0; i < dates.length; i++) {
Expand Down Expand Up @@ -355,8 +355,8 @@ export const Calendar: React.FC<CalendarProps> = ({
return [topValues, bottomValues];
};

let topValues: ReactChild[] = [];
let bottomValues: ReactChild[] = [];
let topValues: ReactNode[] = [];
let bottomValues: ReactNode[] = [];
switch (dateSetup.viewMode) {
case ViewMode.Year:
[topValues, bottomValues] = getCalendarValuesForYear();
Expand Down
10 changes: 5 additions & 5 deletions src/components/grid/grid-body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ReactChild } from "react";
import React, { ReactNode } from "react";
import { Task } from "../../types/public-types";
import { addToDate } from "../../helpers/date-helper";
import styles from "./grid.module.css";
Expand All @@ -22,8 +22,8 @@ export const GridBody: React.FC<GridBodyProps> = ({
rtl,
}) => {
let y = 0;
const gridRows: ReactChild[] = [];
const rowLines: ReactChild[] = [
const gridRows: ReactNode[] = [];
const rowLines: ReactNode[] = [
<line
key="RowLineFirst"
x="0"
Expand Down Expand Up @@ -59,8 +59,8 @@ export const GridBody: React.FC<GridBodyProps> = ({

const now = new Date();
let tickX = 0;
const ticks: ReactChild[] = [];
let today: ReactChild = <rect />;
const ticks: ReactNode[] = [];
let today: ReactNode = <rect />;
for (let i = 0; i < dates.length; i++) {
const date = dates[i];
ticks.push(
Expand Down
2 changes: 1 addition & 1 deletion src/components/task-item/task-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef, useState } from "react";
import React, { JSX, useEffect, useRef, useState } from "react";
import { BarTask } from "../../types/bar-task";
import { GanttContentMoveAction } from "../../types/gantt-task-actions";
import { Bar } from "./bar/bar";
Expand Down