Skip to content

implement drag and drop #21

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 1 commit into from
Oct 4, 2022
Merged

implement drag and drop #21

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
19 changes: 11 additions & 8 deletions .storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
module.exports = {
"stories": [
"../src/**/*.stories.tsx"
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials"
]
}
stories: ["../src/**/*.stories.tsx"],
addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
webpackFinal: async (config) => {
config.module.rules.push({
test: /\.mjs$/,
include: /node_modules/,
type: "javascript/auto",
});
return config;
},
};
13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@
"author": "Prateek Surana",
"license": "MIT",
"devDependencies": {
"react": "^16.13.0",
"react-dom": "^16.13.0",
"@babel/core": "^7.12.9",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"react-uuid": "^1.0.2",
"@babel/core": "^7.12.9",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.0",
"@storybook/addon-actions": "^6.1.9",
Expand All @@ -42,18 +39,22 @@
"@storybook/react": "^6.1.9",
"@types/react": "^17.0.0",
"babel-loader": "^8.2.2",
"framer-motion": "^7.5.1",
"postcss": "^8.2.1",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-uuid": "^1.0.2",
"rollup": "^2.34.2",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-postcss": "^4.0.0",
"rollup-plugin-typescript2": "^0.29.0",
"typescript": "^4.1.2"
},
"peerDependencies": {
"react": "^16.13.0",
"react-dom": "^16.13.0",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-uuid": "^1.0.2"
}
}
188 changes: 104 additions & 84 deletions src/components/Todo/Todo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,105 +2,125 @@ import React, { useState } from "react";

import ExpandMoreIcon from "@material-ui/icons/ExpandMore";
import {
Container,
makeStyles,
Accordion,
AccordionDetails,
AccordionSummary,
Typography,
Container,
makeStyles,
Accordion,
AccordionDetails,
AccordionSummary,
Typography,
} from "@material-ui/core";
import { AnimatePresence, Reorder } from "framer-motion";
import { Item, TodoCompletedItem } from "./common";
import { Form } from "./common/Todo/Form";
import { TodoItem } from "./common/types";

const useStyles = makeStyles({
accordion: {
boxShadow: "none",
borderTop: "1px solid black",
marginTop: "20px",
},
accordionDetails: {
display: "block",
paddingLeft: "0px",
},
accordionSummary: {
paddingLeft: "4.2%",
}
accordion: {
boxShadow: "none",
borderTop: "1px solid black",
marginTop: "20px",
},
accordionDetails: {
display: "block",
paddingLeft: "0px",
},
accordionSummary: {
paddingLeft: "4.2%",
},
reorderItem: {
listStyle: "none",
},
});

export interface TodoAppProps {
defaultItems?: TodoItem[];
onChange: (items: TodoItem[]) => void;
defaultItems?: TodoItem[];
onChange: (items: TodoItem[]) => void;
}

function TodoApp(props: TodoAppProps) {
const { defaultItems = [], onChange } = props;
const [items, setItems] = useState<TodoItem[]>(defaultItems);
const classes = useStyles();
const setItemsCallback = (updatedItems: TodoItem[]) => {
setItems(updatedItems);
onChange(updatedItems);
};
const addItem = (item: TodoItem | TodoItem[]) => {
const itemsCopy = [...items];
if (Array.isArray(item)) {
item.forEach((it) => {
itemsCopy.unshift(it);
});
setItemsCallback([...itemsCopy]);
} else {
itemsCopy.unshift(item);
setItemsCallback([...itemsCopy]);
}
};
const completedItems = items.filter((item: TodoItem) => item.isComplete);
const completedItemsLength = completedItems.length;
const { defaultItems = [], onChange } = props;
const [items, setItems] = useState<TodoItem[]>(defaultItems);
const classes = useStyles();
const setItemsCallback = (updatedItems: TodoItem[]) => {
setItems(updatedItems);
onChange(updatedItems);
};
const addItem = (item: TodoItem | TodoItem[]) => {
const itemsCopy = [...items];
if (Array.isArray(item)) {
item.forEach((it) => {
itemsCopy.unshift(it);
});
setItemsCallback([...itemsCopy]);
} else {
itemsCopy.unshift(item);
setItemsCallback([...itemsCopy]);
}
};
const completedItems = items.filter((item: TodoItem) => item.isComplete);
const completedItemsLength = completedItems.length;
const todoItems = items.filter((item: TodoItem) => !item.isComplete);

const todoItems = items.filter((item: TodoItem) => !item.isComplete);
const handleReorderTodoItems = (newOrder: any[]) => {
const updatedItems = newOrder.reduce(
(currItems: TodoItem[] = [], itemKey) => {
const item = todoItems.find((item) => item.uuid === itemKey);
if (item) {
currItems.push(item);
}
return currItems;
},
[]
);
setItems([...updatedItems, ...completedItems]);
};

return (
<Container>
<Form addItem={addItem} />
{todoItems.map((item, index) => {
return (
<Item
items={items}
addItem={addItem}
key={item.uuid}
itemIndex={index}
setItemsCallback={setItemsCallback}
/>
);
return (
<Container>
<Form addItem={addItem} />
<Reorder.Group
axis="y"
values={items.map((item) => item.uuid)}
onReorder={handleReorderTodoItems}
>
{items.map((item, index) => {
return (
<Item
key={item.uuid}
items={items}
addItem={addItem}
itemIndex={index}
setItemsCallback={setItemsCallback}
/>
);
})}
</Reorder.Group>
{completedItemsLength > 0 && (
<Accordion className={classes.accordion} defaultExpanded={true}>
<AccordionSummary
className={classes.accordionSummary}
expandIcon={<ExpandMoreIcon />}
aria-controls="panel1a-content"
id="panel1a-header"
>
<Typography> {completedItemsLength} Completed items </Typography>
</AccordionSummary>
<AccordionDetails className={classes.accordionDetails}>
{items.map((item, index) => {
return (
<TodoCompletedItem
items={items}
key={item.uuid}
itemIndex={index}
setItemsCallback={setItemsCallback}
/>
);
})}
{completedItemsLength > 0 && (
<Accordion className={classes.accordion} defaultExpanded={true}>
<AccordionSummary
className={classes.accordionSummary}
expandIcon={<ExpandMoreIcon />}
aria-controls="panel1a-content"
id="panel1a-header"
>
<Typography>
{" "}
{completedItemsLength} Completed items{" "}
</Typography>
</AccordionSummary>
<AccordionDetails className={classes.accordionDetails}>
{completedItems.map((item, index) => {
return (
<TodoCompletedItem
items={items}
key={item.uuid}
itemIndex={index}
setItemsCallback={setItemsCallback}
/>
);
})}
</AccordionDetails>
</Accordion>
)}
</Container>
);
</AccordionDetails>
</Accordion>
)}
</Container>
);
}

export default TodoApp;
68 changes: 37 additions & 31 deletions src/components/Todo/common/Todo/CompletedList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,48 @@
import React from "react";
import React, { FC } from "react";
import { Checkbox, Container, Typography, makeStyles } from "@material-ui/core";
import { TodoItem } from "../../types";

const useStyles = makeStyles({
root: {
display: "flex",
width: "100%",
},
subtitle1: {
textDecorationLine: "line-through",
textDecorationStyle: "solid",
padding: "10px 0px 7px",
},
root: {
display: "flex",
width: "100%",
},
subtitle1: {
textDecorationLine: "line-through",
textDecorationStyle: "solid",
padding: "10px 0px 7px",
},
});

export interface TodoCompletedItemsProp {
items: TodoItem[];
setItemsCallback: (updatedItems: TodoItem[]) => void;
itemIndex: number;
export interface Props {
items: TodoItem[];
setItemsCallback: (updatedItems: TodoItem[]) => void;
itemIndex: number;
}

export const TodoCompletedItem = (props: TodoCompletedItemsProp) => {
const { items, setItemsCallback, itemIndex } = props;
const classes = useStyles();
if (!items[itemIndex].isComplete) return null;
export const TodoCompletedItem: FC<Props> = ({
items,
setItemsCallback,
itemIndex,
}) => {
const classes = useStyles();

if (items[itemIndex].isComplete) {
return (
<Container className={classes.root}>
<Checkbox
checked
onChange={(e) => {
items[itemIndex].isComplete = false;
setItemsCallback([...items]);
}}
/>
<Typography variant="subtitle1" className={classes.subtitle1}>
{items[itemIndex].name}
</Typography>
</Container>
<Container className={classes.root}>
<Checkbox
checked
onChange={(e) => {
items[itemIndex].isComplete = false;
setItemsCallback([...items]);
}}
/>
<Typography variant="subtitle1" className={classes.subtitle1}>
{items[itemIndex].name}
</Typography>
</Container>
);
};
}

return null;
};
Loading