Skip to content

Commit 8eaaaa3

Browse files
authored
Merge pull request #187 from wafflestudio/dev
dev->main 반영- memo 클릭 hotfix
2 parents ce33b28 + 744a89e commit 8eaaaa3

3 files changed

Lines changed: 10 additions & 24 deletions

File tree

src/components/layout/sidePannel/DetailView.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,15 @@ const DetailView = ({ eventId }: { eventId: number }) => {
185185
</div>
186186

187187
{/* ----- Memo & Tag Section ----- */}
188-
<div ref={memoWrapperRef} data-tour-id="detail-tour-memo">
188+
{/* biome-ignore lint/a11y/noStaticElementInteractions: memo wrapper handles pointer events to prevent the parent panel's outside-click handler from closing it */}
189+
<div
190+
ref={memoWrapperRef}
191+
data-tour-id="detail-tour-memo"
192+
onMouseDown={(event) => {
193+
event.stopPropagation();
194+
setIsMemoExpanded(true);
195+
}}
196+
>
189197
<DetailMemo
190198
eventId={eventId}
191199
isMemoExpanded={isMemoExpanded}

src/pages/timetable/Timetable.module.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -393,19 +393,6 @@
393393
opacity: 0.85;
394394
}
395395

396-
.simplifiedBlock {
397-
background: #000000;
398-
opacity: 0.15;
399-
pointer-events: none;
400-
z-index: 10;
401-
}
402-
403-
.simplifiedBlock .blockRemove,
404-
.simplifiedBlock .blockTitle,
405-
.simplifiedBlock .blockTime {
406-
display: none;
407-
}
408-
409396
.eventBlock {
410397
position: absolute;
411398
box-sizing: border-box;
@@ -698,10 +685,6 @@
698685
line-height: 1.25;
699686
}
700687

701-
.blockRemove {
702-
display: none;
703-
}
704-
705688
.blockTitle {
706689
margin-bottom: 3px;
707690
font-size: 11px;

src/pages/timetable/TimetableGrid.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ export function TimetableGrid({
160160
config={config}
161161
// onSelectBlock={onSelectBlock}
162162
onRemoveBlock={onRemoveBlock}
163-
isSimplified={isSimplified}
164163
eventBlocks={isSimplified ? eventBlocksByDay[d] : []}
165164
onSelectEvent={onSelectEvent}
166165
/>
@@ -178,7 +177,6 @@ function DayColumn<T>({
178177
config,
179178
onSelectBlock,
180179
onRemoveBlock,
181-
isSimplified,
182180
eventBlocks,
183181
onSelectEvent,
184182
}: {
@@ -188,7 +186,6 @@ function DayColumn<T>({
188186
config: GridConfig;
189187
onSelectBlock?: (id: number, item: T) => void;
190188
onRemoveBlock?: (timetableId: number, enrollId: number) => Promise<void>;
191-
isSimplified: boolean;
192189
eventBlocks: LayoutedBlock[];
193190
onSelectEvent?: (event: Event) => void;
194191
}) {
@@ -199,9 +196,7 @@ function DayColumn<T>({
199196
{blocks.map((b) => (
200197
<button
201198
key={b.id}
202-
className={`${styles.block} ${
203-
isSimplified ? styles.simplifiedBlock : ""
204-
}`}
199+
className={styles.block}
205200
style={{
206201
top: b.top,
207202
height: b.height,

0 commit comments

Comments
 (0)