Skip to content

Merging Wendy's Contributions #16

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
Kaz-Smino merged 3 commits into from
Feb 4, 2024
Merged

Merging Wendy's Contributions #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f423c21
removed vertical compacting
wendykuo-stemcell Jan 26, 2024
2e54e19
Merge branch 'dev' of https://github.com/chingu-voyages/v47-tier2-tea…
wendykuo-stemcell Jan 26, 2024
ff37e48
fixed draggable task box from outside
wendykuo-stemcell Jan 28, 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
23 changes: 11 additions & 12 deletions DailyTasksApp/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,12 @@ function App() {
const [staticLayout, setStaticLayout] = useState(layout)
const [taskName, setTaskName] = useState("")

function getDroppingItem() {
return {
i: layout.length,
x: 3,
y: 3,
w: 2,
h: 2,
}
}
const onDrop = (layout, layoutItem, _event) => {
console.log(layoutItem)
layoutItem.isResiable = true
layoutItem.static = true
layoutItem.moved = true
layoutItem.resizeHandles = true
layoutItem.i = taskName
setStaticLayout([...staticLayout, layoutItem])
alert(`Dropped element props:\n${JSON.stringify(layoutItem, ['x', 'y', 'w', 'h'], 2)}`);
Expand All @@ -43,6 +38,7 @@ function App() {
<div
className="droppable-element"
draggable={true}
unselectable='on'
// unselectable="on"
// onDragStart={(e) => {
// e.dataTransfer.setData("text/plain", "");
Expand Down Expand Up @@ -80,13 +76,16 @@ function App() {
// preventCollision={!this.state.compactType}
isDroppable={true}
draggable={true}
// measureBeforeMount={false}
preventCollision={true}

// onDropDragOver= {(e) => ({ i: layout.length, w:2, h:1 }) }
onDrop={onDrop}


>
{staticLayout.map (n => (
<div key={n.i} data-grid={{ x: n.x, y: n.y, w: n.w, maxW: 3, h: n.h }}>{n.i}</div>
{staticLayout.map ((n, i) => (
<div key={i} data-grid={{ x: n.x, y: n.y, w: n.w, maxW: 3, h: n.h }}>{n.i}</div>
))}
{/* <div key="a" data-grid={{ x: 0, y: 0, w: 2, maxW: 3, h: 1 }}>a</div>
<div key="b" data-grid={{ x: 1, y: 4, w: 3, maxW: 3, h: 1 }}>Saturday</div>
Expand Down
⚡