From a9d6ef024083de67fe771e9355aee107cd58d96b Mon Sep 17 00:00:00 2001 From: Manuk Date: Mon, 16 Nov 2026 00:30:58 +0400 Subject: [PATCH] fix(columns): scroll a column cut off at the board edge into view before its menu opens --- resources/dist/flowforge-modern.js | 2 +- resources/js/flowforge-modern.js | 40 +++++++++++++++++++++++++++++- tests/Browser/ModernBoardTest.php | 29 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/resources/dist/flowforge-modern.js b/resources/dist/flowforge-modern.js index 6fa3b8ff4..e09793b39 100644 --- a/resources/dist/flowforge-modern.js +++ b/resources/dist/flowforge-modern.js @@ -1 +1 @@ -var L=["--ff-surface","--ff-surface-sunken","--ff-surface-raised","--ff-border","--ff-text","--ff-text-muted","--ff-accent","--ff-accent-tint","--ff-danger","--ff-warning","--ff-radius","--ff-gap","--ff-ease","--ff-duration","--ff-column-width","--ff-dot-size","--ff-overlay-radius","--ff-overlay-shadow","--ff-tray-bg","--ff-tray-radius","--ff-card-bg","--ff-card-ring","--ff-card-radius","--ff-card-shadow","--ff-card-padding","--ff-drag-tilt","--ff-drag-shadow","--ff-placeholder-border"],c='.ff-column-actions, .fi-dropdown-panel, input, textarea, select, [contenteditable]:not([contenteditable="false"])',C=`.ff-card, .ff-column-header, .ff-add-slot, .ff-add-row, .ff-cards-more, .ff-limit-hint, button, a, ${c}`,f=4,D=300,x=e=>{let t=e.querySelector("[data-autofocus]");!t||e.style.display!=="block"||!window.matchMedia("(pointer: fine)").matches||(t.focus({preventScroll:!0}),t.setSelectionRange?.(t.value.length,t.value.length))},p=4,h=e=>[...e.querySelectorAll('[role="radio"]')],w=new WeakSet,g=new WeakSet,b=()=>window.Sortable.active||window.Sortable.dragged;function T(){return{isLoading:{},fullyLoaded:{},dragOverColumn:null,railToggledAt:0,railClickTimer:null,columnMenuPressAt:null,railPressAt:null,dragOverLane:null,dragSource:null,pendingCounts:{},pendingMoves:0,collapsedLanes:{},addingColumn:!1,newColumnName:"",newColumnColor:null,newColumnDotStyle:"",newColumnColorPicked:!1,choosingNewColumnColor:!1,newColumnTouched:!1,addingColumnPending:!1,placeholder:null,stopTrackingPointer:null,init(){this.$wire.$on("kanban-items-loaded",e=>{let{columnId:t,isFullyLoaded:o}=e;o&&(this.fullyLoaded[t]=!0)})},configureSortable(e){if(!e.sortable||e.sortable.options.forceFallback)return;if(b()){this.configureSortableAfterDrag(e);return}let t=window.matchMedia("(prefers-reduced-motion: reduce)").matches;e.sortable.destroy(),e.sortable=window.Sortable.create(e,{draggable:"[x-sortable-item]",handle:"[x-sortable-handle]",dataIdAttr:"x-sortable-item",forceFallback:!0,fallbackTolerance:5,fallbackOnBody:!0,fallbackClass:"",ghostClass:"",delay:150,delayOnTouchOnly:!0,animation:t?0:200,scrollSensitivity:100,scrollSpeed:15,forceAutoScrollFallback:!0,group:{name:e.getAttribute("x-sortable-group"),pull:!0,put:(o,r)=>this.canDrop(o.el,r.el)},onStart:o=>this.startDrag(o),onEnd(o){let{item:r,to:n,oldDraggableIndex:s,newDraggableIndex:a}=o;if(s===a)return;let i=n.querySelectorAll(`:scope > ${this.options.draggable}`)[a-1];i&&n.insertBefore(r,i.nextSibling)}})},configureSortableAfterDrag(e){if(g.has(e))return;g.add(e);let t=()=>{if(b()){requestAnimationFrame(t);return}g.delete(e),e.isConnected&&this.configureSortable(e)};requestAnimationFrame(t)},startDrag(e){this.stopTrackingPointer?.(),this.placeholder=e.item,this.placeholder.setAttribute("data-placeholder",""),this.markGhost(),window.getSelection()?.removeAllRanges(),document.documentElement.classList.add("ff-dragging"),this.dragSource={column:e.from.dataset.columnId,lane:e.from.dataset.laneId??null};let t=o=>this.trackPointer(o);document.addEventListener("pointermove",t,{passive:!0}),document.addEventListener("touchmove",t,{passive:!0}),this.stopTrackingPointer=()=>{document.removeEventListener("pointermove",t),document.removeEventListener("touchmove",t)}},trackPointer(e){if(!window.Sortable.active){this.endDrag();return}this.markGhost();let t=e.touches?.[0]??e,o=document.elementFromPoint(t.clientX,t.clientY),r=o?.closest("[data-column-id]"),n=o?.closest("[data-column-root]");this.dragOverColumn=r?.dataset.columnId??n?.dataset.columnRoot??null,this.dragOverLane=r?.dataset.laneId??null},markGhost(){let e=window.Sortable.ghost;if(!e||e.hasAttribute("data-dragging"))return;e.removeAttribute("data-placeholder"),e.setAttribute("data-dragging",""),e.style.opacity="1";let t=getComputedStyle(this.placeholder);for(let o of L){let r=t.getPropertyValue(o);r!==""&&e.style.setProperty(o,r)}},endDrag(){document.documentElement.classList.remove("ff-dragging"),this.placeholder?.removeAttribute("data-placeholder"),this.placeholder=null,this.stopTrackingPointer?.(),this.stopTrackingPointer=null,this.dragOverColumn=null,this.dragOverLane=null,this.dragSource=null},railPress(e){this.railPressAt={x:e.clientX,y:e.clientY}},toggleColumnCollapse(e,t,o=!1){if(!(e.target.closest(c)||o&&e.detail>1)){if(o){let r=this.railPressAt;if(this.railPressAt=null,r&&Math.hypot(e.clientX-r.x,e.clientY-r.y)>f)return}Date.now()-this.railToggledAt<500||(o&&(this.railToggledAt=Date.now()),this.$wire.toggleBoardColumnCollapse(t))}},expandFromCollapseAll(e,t){let o=this.railPressAt;if(this.railPressAt=null,e.target.closest(c)||o&&Math.hypot(e.clientX-o.x,e.clientY-o.y)>f)return;let r=e.detail>1;clearTimeout(this.railClickTimer),this.railClickTimer=setTimeout(()=>{this.railToggledAt=Date.now(),this.$wire.toggleBoardColumnCollapse(t,r)},r?0:D)},collapseFromEmptySpace(e,t){e.target.closest(C)||this.toggleColumnCollapse(e,t)},suppressEmptySpaceSelection(e){e.detail>1&&!e.target.closest(C)&&e.preventDefault()},openNewColumn(e=null,t=""){this.addingColumn=!0,this.newColumnTouched=!0,this.newColumnColor=e,this.newColumnDotStyle=t,this.newColumnColorPicked=!1,this.$nextTick(()=>requestAnimationFrame(()=>{let o=this.$refs.newColumnInput,r=o.closest(".ff-columns, .ff-lanes");o.focus({preventScroll:!0}),r?.scrollTo({left:r.scrollWidth}),o.closest(".ff-add-column-ghost").scrollIntoView({block:"nearest"})}))},cancelNewColumn(){this.addingColumn=!1,this.newColumnTouched=!0,this.newColumnName="",this.newColumnColor=null,this.newColumnDotStyle="",this.choosingNewColumnColor=!1},closeNewColumnColors(){this.choosingNewColumnColor=!1,this.$refs.newColumnDot?.focus({preventScroll:!0})},pickNewColumnColor(e,t){this.newColumnColorPicked=!0,this.newColumnColor=e,this.newColumnDotStyle=t,this.choosingNewColumnColor=!1,this.$refs.newColumnInput.focus({preventScroll:!0})},async submitNewColumn(){if(!this.addingColumnPending){this.addingColumnPending=!0,this.newColumnTouched=!0;try{await this.$wire.addBoardColumn(this.newColumnName,this.newColumnColorPicked?this.newColumnColor:null)}finally{this.addingColumnPending=!1}this.newColumnTouched=!1,this.$root.querySelector(".ff-add-column-error")||this.cancelNewColumn()}},suppressDoubleClickSelection(e){e.detail>1&&!e.target.closest(c)&&e.preventDefault()},initColumnMenu(e){let t=e.closest(".fi-dropdown");if(w.has(t))return;let o=window.Alpine.$data(t),r=o.toggle.bind(o);w.add(t),o.toggle=n=>n?.type==="mousedown"?void 0:r(n)},columnMenuPress(e){this.columnMenuPressAt={x:e.clientX,y:e.clientY}},columnMenuClick(e){let t=this.columnMenuPressAt;if(this.columnMenuPressAt=null,e.detail>1||t&&Math.hypot(e.clientX-t.x,e.clientY-t.y)>f)return;let o=e.currentTarget.closest(".fi-dropdown");window.Alpine.$data(o).toggle(e),requestAnimationFrame(()=>x(o.querySelector(":scope > .fi-dropdown-panel")))},focusSwatch(e){let t=h(e),o=t.find(r=>r.getAttribute("aria-checked")==="true")??t[0];requestAnimationFrame(()=>o?.focus({preventScroll:!0}))},swatchFocused(e){let t=e.target.closest('[role="radiogroup"]');h(t).forEach(o=>o.setAttribute("tabindex",o===e.target?"0":"-1"))},swatchKey(e){let t=h(e.currentTarget),o=t.indexOf(e.target),r=t.length-1,n={ArrowRight:o===r?0:o+1,ArrowLeft:o===0?r:o-1,ArrowDown:Math.min(o+p,r),ArrowUp:Math.max(o-p,0),Home:0,End:r}[e.key];o<0||n===void 0||(e.preventDefault(),t[n].focus({preventScroll:!0}))},columnDrop(e){return this.dragOverColumn!==e?null:this.isColumnBlocked(e)?"blocked":"active"},cellDrop(e,t){return this.dragOverColumn!==e||this.dragOverLane!==t?null:this.isCellBlocked(e,t)?"blocked":"active"},canDrop(e,t){if(!this.$root.contains(e)||!this.$root.contains(t))return!1;let o=e.dataset.laneId??null,r=t.dataset.laneId??null;return o!==r&&this.$root.dataset.lanesWritable!=="true"?!1:!this.isColumnBlocked(e.dataset.columnId,t.dataset.columnId)},isColumnBlocked(e,t=this.dragSource?.column){if(!e||e===t)return!1;let o=this.$root.querySelector(`[data-column-root="${CSS.escape(e)}"]`),r=o?.dataset.columnLimit;return r===void 0||r===""?!1:Number(o.dataset.columnTotal)>=Number(r)},isCellBlocked(e,t){return this.dragSource?t!==this.dragSource.lane&&this.$root.dataset.lanesWritable!=="true"?!0:this.isColumnBlocked(e):!1},displayCount(e,t){let o=this.pendingCounts[e]??t,r=this.dragSource?.column,n=this.dragOverColumn;return!r||!n||r===n||this.isColumnBlocked(n)?o:e===n?o+1:e===r?o-1:o},holdMovedCounts(e,t){if(e===t)return()=>{};let o={[e]:-1,[t]:1},r=!1;for(let[n,s]of Object.entries(o))this.pendingCounts[n]=this.renderedCount(n)+s;return this.pendingMoves++,n=>{if(!r){if(r=!0,n)for(let[s,a]of Object.entries(o))this.pendingCounts[s]-=a;--this.pendingMoves===0&&(this.pendingCounts={})}}},renderedCount(e){let t=this.$root.querySelector(`[data-column-root="${CSS.escape(e)}"] .ff-count`);return this.pendingCounts[e]??Number(t?.dataset.total)},handleSortableEnd(e){this.endDrag();let t=e.item,o=e.to,r=e.newDraggableIndex??e.newIndex,n=":scope > [x-sortable-item], :scope > [data-card-id]",s=l=>l.getAttribute("x-sortable-item")||l.getAttribute("data-card-id");if(e.from===o&&e.oldDraggableIndex===e.newDraggableIndex)return;if(r===0){let l=o.querySelector(n);l&&l!==t&&o.insertBefore(t,l)}let a=s(t);if(!a){console.error("Flowforge: Could not determine card ID for move operation");return}let i=o.getAttribute("data-column-id");if(!i){console.error("Flowforge: Target column ID is missing");return}let S=e.from.dataset.laneId??null,y=o.dataset.laneId??null,d=o.querySelectorAll(n),u=Array.prototype.indexOf.call(d,t),A=u>0?s(d[u-1]):null,k=u>=0&&u{this.setCardState(t,!1),m(l===!1),l===!1&&this.revertCard(e)}).catch(()=>{this.setCardState(t,!1),m(!0),this.revertCard(e)})},revertCard({item:e,from:t,oldDraggableIndex:o}){e.remove();let r=t.querySelectorAll(":scope > [x-sortable-item]"),n=r[r.length-1],s=r[o]??(n?n.nextSibling:t.firstChild);t.insertBefore(e,s)},setCardState(e,t){e.toggleAttribute("data-pending",t)},isLaneCollapsed(e){return this.collapsedLanes[e]===!0},toggleLane(e){this.collapsedLanes[e]=!this.isLaneCollapsed(e)},isLoadingColumn(e){return this.isLoading[e]||!1},isColumnFullyLoaded(e){return this.fullyLoaded[e]||!1},handleSmoothScroll(e){this.isLoadingColumn(e)||this.isColumnFullyLoaded(e)||(this.isLoading[e]=!0,this.$wire.loadMoreItems(e).then(()=>setTimeout(()=>this.isLoading[e]=!1,100)).catch(()=>this.isLoading[e]=!1))},handleColumnScroll(e,t){if(this.isColumnFullyLoaded(t))return;let{scrollTop:o,scrollHeight:r,clientHeight:n}=e.target;(o+n)/r>=.8&&!this.isLoadingColumn(t)&&this.handleSmoothScroll(t)}}}export{T as default}; +var L=["--ff-surface","--ff-surface-sunken","--ff-surface-raised","--ff-border","--ff-text","--ff-text-muted","--ff-accent","--ff-accent-tint","--ff-danger","--ff-warning","--ff-radius","--ff-gap","--ff-ease","--ff-duration","--ff-column-width","--ff-dot-size","--ff-overlay-radius","--ff-overlay-shadow","--ff-tray-bg","--ff-tray-radius","--ff-card-bg","--ff-card-ring","--ff-card-radius","--ff-card-shadow","--ff-card-padding","--ff-drag-tilt","--ff-drag-shadow","--ff-placeholder-border"],f='.ff-column-actions, .fi-dropdown-panel, input, textarea, select, [contenteditable]:not([contenteditable="false"])',C=`.ff-card, .ff-column-header, .ff-add-slot, .ff-add-row, .ff-cards-more, .ff-limit-hint, button, a, ${f}`,h=4,D=300,x=e=>{let t=e.querySelector("[data-autofocus]");!t||e.style.display!=="block"||!window.matchMedia("(pointer: fine)").matches||(t.focus({preventScroll:!0}),t.setSelectionRange?.(t.value.length,t.value.length))},T=e=>{let t=e?.closest(".ff-columns, .ff-lanes");if(!t)return;let o=getComputedStyle(t),n=t.getBoundingClientRect().left+t.clientLeft,r=n+parseFloat(o.paddingLeft),s=n+t.clientWidth-parseFloat(o.paddingRight),{left:l,right:a}=e.getBoundingClientRect(),d=l[...e.querySelectorAll('[role="radio"]')],b=new WeakSet,m=new WeakSet,S=()=>window.Sortable.active||window.Sortable.dragged;function P(){return{isLoading:{},fullyLoaded:{},dragOverColumn:null,railToggledAt:0,railClickTimer:null,columnMenuPressAt:null,railPressAt:null,dragOverLane:null,dragSource:null,pendingCounts:{},pendingMoves:0,collapsedLanes:{},addingColumn:!1,newColumnName:"",newColumnColor:null,newColumnDotStyle:"",newColumnColorPicked:!1,choosingNewColumnColor:!1,newColumnTouched:!1,addingColumnPending:!1,placeholder:null,stopTrackingPointer:null,init(){this.$wire.$on("kanban-items-loaded",e=>{let{columnId:t,isFullyLoaded:o}=e;o&&(this.fullyLoaded[t]=!0)})},configureSortable(e){if(!e.sortable||e.sortable.options.forceFallback)return;if(S()){this.configureSortableAfterDrag(e);return}let t=window.matchMedia("(prefers-reduced-motion: reduce)").matches;e.sortable.destroy(),e.sortable=window.Sortable.create(e,{draggable:"[x-sortable-item]",handle:"[x-sortable-handle]",dataIdAttr:"x-sortable-item",forceFallback:!0,fallbackTolerance:5,fallbackOnBody:!0,fallbackClass:"",ghostClass:"",delay:150,delayOnTouchOnly:!0,animation:t?0:200,scrollSensitivity:100,scrollSpeed:15,forceAutoScrollFallback:!0,group:{name:e.getAttribute("x-sortable-group"),pull:!0,put:(o,n)=>this.canDrop(o.el,n.el)},onStart:o=>this.startDrag(o),onEnd(o){let{item:n,to:r,oldDraggableIndex:s,newDraggableIndex:l}=o;if(s===l)return;let a=r.querySelectorAll(`:scope > ${this.options.draggable}`)[l-1];a&&r.insertBefore(n,a.nextSibling)}})},configureSortableAfterDrag(e){if(m.has(e))return;m.add(e);let t=()=>{if(S()){requestAnimationFrame(t);return}m.delete(e),e.isConnected&&this.configureSortable(e)};requestAnimationFrame(t)},startDrag(e){this.stopTrackingPointer?.(),this.placeholder=e.item,this.placeholder.setAttribute("data-placeholder",""),this.markGhost(),window.getSelection()?.removeAllRanges(),document.documentElement.classList.add("ff-dragging"),this.dragSource={column:e.from.dataset.columnId,lane:e.from.dataset.laneId??null};let t=o=>this.trackPointer(o);document.addEventListener("pointermove",t,{passive:!0}),document.addEventListener("touchmove",t,{passive:!0}),this.stopTrackingPointer=()=>{document.removeEventListener("pointermove",t),document.removeEventListener("touchmove",t)}},trackPointer(e){if(!window.Sortable.active){this.endDrag();return}this.markGhost();let t=e.touches?.[0]??e,o=document.elementFromPoint(t.clientX,t.clientY),n=o?.closest("[data-column-id]"),r=o?.closest("[data-column-root]");this.dragOverColumn=n?.dataset.columnId??r?.dataset.columnRoot??null,this.dragOverLane=n?.dataset.laneId??null},markGhost(){let e=window.Sortable.ghost;if(!e||e.hasAttribute("data-dragging"))return;e.removeAttribute("data-placeholder"),e.setAttribute("data-dragging",""),e.style.opacity="1";let t=getComputedStyle(this.placeholder);for(let o of L){let n=t.getPropertyValue(o);n!==""&&e.style.setProperty(o,n)}},endDrag(){document.documentElement.classList.remove("ff-dragging"),this.placeholder?.removeAttribute("data-placeholder"),this.placeholder=null,this.stopTrackingPointer?.(),this.stopTrackingPointer=null,this.dragOverColumn=null,this.dragOverLane=null,this.dragSource=null},railPress(e){this.railPressAt={x:e.clientX,y:e.clientY}},toggleColumnCollapse(e,t,o=!1){if(!(e.target.closest(f)||o&&e.detail>1)){if(o){let n=this.railPressAt;if(this.railPressAt=null,n&&Math.hypot(e.clientX-n.x,e.clientY-n.y)>h)return}Date.now()-this.railToggledAt<500||(o&&(this.railToggledAt=Date.now()),this.$wire.toggleBoardColumnCollapse(t))}},expandFromCollapseAll(e,t){let o=this.railPressAt;if(this.railPressAt=null,e.target.closest(f)||o&&Math.hypot(e.clientX-o.x,e.clientY-o.y)>h)return;let n=e.detail>1;clearTimeout(this.railClickTimer),this.railClickTimer=setTimeout(()=>{this.railToggledAt=Date.now(),this.$wire.toggleBoardColumnCollapse(t,n)},n?0:D)},collapseFromEmptySpace(e,t){e.target.closest(C)||this.toggleColumnCollapse(e,t)},suppressEmptySpaceSelection(e){e.detail>1&&!e.target.closest(C)&&e.preventDefault()},openNewColumn(e=null,t=""){this.addingColumn=!0,this.newColumnTouched=!0,this.newColumnColor=e,this.newColumnDotStyle=t,this.newColumnColorPicked=!1,this.$nextTick(()=>requestAnimationFrame(()=>{let o=this.$refs.newColumnInput,n=o.closest(".ff-columns, .ff-lanes");o.focus({preventScroll:!0}),n?.scrollTo({left:n.scrollWidth}),o.closest(".ff-add-column-ghost").scrollIntoView({block:"nearest"})}))},cancelNewColumn(){this.addingColumn=!1,this.newColumnTouched=!0,this.newColumnName="",this.newColumnColor=null,this.newColumnDotStyle="",this.choosingNewColumnColor=!1},closeNewColumnColors(){this.choosingNewColumnColor=!1,this.$refs.newColumnDot?.focus({preventScroll:!0})},pickNewColumnColor(e,t){this.newColumnColorPicked=!0,this.newColumnColor=e,this.newColumnDotStyle=t,this.choosingNewColumnColor=!1,this.$refs.newColumnInput.focus({preventScroll:!0})},async submitNewColumn(){if(!this.addingColumnPending){this.addingColumnPending=!0,this.newColumnTouched=!0;try{await this.$wire.addBoardColumn(this.newColumnName,this.newColumnColorPicked?this.newColumnColor:null)}finally{this.addingColumnPending=!1}this.newColumnTouched=!1,this.$root.querySelector(".ff-add-column-error")||this.cancelNewColumn()}},suppressDoubleClickSelection(e){e.detail>1&&!e.target.closest(f)&&e.preventDefault()},initColumnMenu(e){let t=e.closest(".fi-dropdown");if(b.has(t))return;let o=window.Alpine.$data(t),n=o.toggle.bind(o),r=o.open.bind(o),s=t.querySelector(":scope > .fi-dropdown-panel"),l=()=>{s?.style.display!=="block"&&T(e.closest("[data-column-root]"))};b.add(t),o.toggle=a=>{a?.type!=="mousedown"&&(l(),n(a))},o.open=a=>{l(),r(a)}},columnMenuPress(e){this.columnMenuPressAt={x:e.clientX,y:e.clientY}},columnMenuClick(e){let t=this.columnMenuPressAt;if(this.columnMenuPressAt=null,e.detail>1||t&&Math.hypot(e.clientX-t.x,e.clientY-t.y)>h)return;let o=e.currentTarget.closest(".fi-dropdown");window.Alpine.$data(o).toggle(e),requestAnimationFrame(()=>x(o.querySelector(":scope > .fi-dropdown-panel")))},focusSwatch(e){let t=g(e),o=t.find(n=>n.getAttribute("aria-checked")==="true")??t[0];requestAnimationFrame(()=>o?.focus({preventScroll:!0}))},swatchFocused(e){let t=e.target.closest('[role="radiogroup"]');g(t).forEach(o=>o.setAttribute("tabindex",o===e.target?"0":"-1"))},swatchKey(e){let t=g(e.currentTarget),o=t.indexOf(e.target),n=t.length-1,r={ArrowRight:o===n?0:o+1,ArrowLeft:o===0?n:o-1,ArrowDown:Math.min(o+w,n),ArrowUp:Math.max(o-w,0),Home:0,End:n}[e.key];o<0||r===void 0||(e.preventDefault(),t[r].focus({preventScroll:!0}))},columnDrop(e){return this.dragOverColumn!==e?null:this.isColumnBlocked(e)?"blocked":"active"},cellDrop(e,t){return this.dragOverColumn!==e||this.dragOverLane!==t?null:this.isCellBlocked(e,t)?"blocked":"active"},canDrop(e,t){if(!this.$root.contains(e)||!this.$root.contains(t))return!1;let o=e.dataset.laneId??null,n=t.dataset.laneId??null;return o!==n&&this.$root.dataset.lanesWritable!=="true"?!1:!this.isColumnBlocked(e.dataset.columnId,t.dataset.columnId)},isColumnBlocked(e,t=this.dragSource?.column){if(!e||e===t)return!1;let o=this.$root.querySelector(`[data-column-root="${CSS.escape(e)}"]`),n=o?.dataset.columnLimit;return n===void 0||n===""?!1:Number(o.dataset.columnTotal)>=Number(n)},isCellBlocked(e,t){return this.dragSource?t!==this.dragSource.lane&&this.$root.dataset.lanesWritable!=="true"?!0:this.isColumnBlocked(e):!1},displayCount(e,t){let o=this.pendingCounts[e]??t,n=this.dragSource?.column,r=this.dragOverColumn;return!n||!r||n===r||this.isColumnBlocked(r)?o:e===r?o+1:e===n?o-1:o},holdMovedCounts(e,t){if(e===t)return()=>{};let o={[e]:-1,[t]:1},n=!1;for(let[r,s]of Object.entries(o))this.pendingCounts[r]=this.renderedCount(r)+s;return this.pendingMoves++,r=>{if(!n){if(n=!0,r)for(let[s,l]of Object.entries(o))this.pendingCounts[s]-=l;--this.pendingMoves===0&&(this.pendingCounts={})}}},renderedCount(e){let t=this.$root.querySelector(`[data-column-root="${CSS.escape(e)}"] .ff-count`);return this.pendingCounts[e]??Number(t?.dataset.total)},handleSortableEnd(e){this.endDrag();let t=e.item,o=e.to,n=e.newDraggableIndex??e.newIndex,r=":scope > [x-sortable-item], :scope > [data-card-id]",s=i=>i.getAttribute("x-sortable-item")||i.getAttribute("data-card-id");if(e.from===o&&e.oldDraggableIndex===e.newDraggableIndex)return;if(n===0){let i=o.querySelector(r);i&&i!==t&&o.insertBefore(t,i)}let l=s(t);if(!l){console.error("Flowforge: Could not determine card ID for move operation");return}let a=o.getAttribute("data-column-id");if(!a){console.error("Flowforge: Target column ID is missing");return}let d=e.from.dataset.laneId??null,y=o.dataset.laneId??null,u=o.querySelectorAll(r),c=Array.prototype.indexOf.call(u,t),A=c>0?s(u[c-1]):null,k=c>=0&&c{this.setCardState(t,!1),p(i===!1),i===!1&&this.revertCard(e)}).catch(()=>{this.setCardState(t,!1),p(!0),this.revertCard(e)})},revertCard({item:e,from:t,oldDraggableIndex:o}){e.remove();let n=t.querySelectorAll(":scope > [x-sortable-item]"),r=n[n.length-1],s=n[o]??(r?r.nextSibling:t.firstChild);t.insertBefore(e,s)},setCardState(e,t){e.toggleAttribute("data-pending",t)},isLaneCollapsed(e){return this.collapsedLanes[e]===!0},toggleLane(e){this.collapsedLanes[e]=!this.isLaneCollapsed(e)},isLoadingColumn(e){return this.isLoading[e]||!1},isColumnFullyLoaded(e){return this.fullyLoaded[e]||!1},handleSmoothScroll(e){this.isLoadingColumn(e)||this.isColumnFullyLoaded(e)||(this.isLoading[e]=!0,this.$wire.loadMoreItems(e).then(()=>setTimeout(()=>this.isLoading[e]=!1,100)).catch(()=>this.isLoading[e]=!1))},handleColumnScroll(e,t){if(this.isColumnFullyLoaded(t))return;let{scrollTop:o,scrollHeight:n,clientHeight:r}=e.target;(o+r)/n>=.8&&!this.isLoadingColumn(t)&&this.handleSmoothScroll(t)}}}export{P as default}; diff --git a/resources/js/flowforge-modern.js b/resources/js/flowforge-modern.js index 0a3485bb3..c551bb2f5 100644 --- a/resources/js/flowforge-modern.js +++ b/resources/js/flowforge-modern.js @@ -50,6 +50,26 @@ const focusMenuField = (panel) => { field.setSelectionRange?.(field.value.length, field.value.length); }; +// A menu opens over its column, so a column cut off at the board's edge first scrolls fully inside the padding. +const revealColumn = (column) => { + const board = column?.closest('.ff-columns, .ff-lanes'); + + if (!board) { + return; + } + + const style = getComputedStyle(board); + const edge = board.getBoundingClientRect().left + board.clientLeft; + const start = edge + parseFloat(style.paddingLeft); + const end = edge + board.clientWidth - parseFloat(style.paddingRight); + const { left, right } = column.getBoundingClientRect(); + const offset = left < start ? left - start : Math.max(0, Math.min(right - end, left - start)); + + if (offset !== 0) { + board.scrollBy({ left: offset }); + } +}; + const SWATCH_COLUMNS = 4; const swatchesOf = (group) => [...group.querySelectorAll('[role="radio"]')]; @@ -393,9 +413,27 @@ export default function flowforgeModern() { const dropdown = window.Alpine.$data(root); const toggle = dropdown.toggle.bind(dropdown); + const open = dropdown.open.bind(dropdown); + const panel = root.querySelector(':scope > .fi-dropdown-panel'); + const revealBeforeOpening = () => { + if (panel?.style.display !== 'block') { + revealColumn(trigger.closest('[data-column-root]')); + } + }; menusIgnoringMousedown.add(root); - dropdown.toggle = (event) => (event?.type === 'mousedown' ? undefined : toggle(event)); + dropdown.toggle = (event) => { + if (event?.type === 'mousedown') { + return; + } + + revealBeforeOpening(); + toggle(event); + }; + dropdown.open = (event) => { + revealBeforeOpening(); + open(event); + }; }, columnMenuPress(event) { diff --git a/tests/Browser/ModernBoardTest.php b/tests/Browser/ModernBoardTest.php index 1cc895fce..4e4715270 100644 --- a/tests/Browser/ModernBoardTest.php +++ b/tests/Browser/ModernBoardTest.php @@ -940,6 +940,35 @@ function boardTraySampler(int $budgetMilliseconds): string expect($page->script("document.querySelector('{$root} .fi-dropdown-panel').innerText"))->toContain("Block for {$label}")->toContain('Archive column'); })->with([['todo', 'To Do'], ['in_progress', 'In Progress']]); +test('clicking the header of a column cut off at the board edge scrolls the column fully into view', function (string $column, int $scrollLeft) { + boardSeed(); + $page = boardPage('/modern/test-menu-board')->resize(520, 800); + $pointer = Pointer::on($page); + $root = "[data-column-root=\"{$column}\"]"; + $inside = << { + const board = document.querySelector('.ff-columns'); + const style = getComputedStyle(board); + const edge = board.getBoundingClientRect().left + board.clientLeft; + const column = document.querySelector('{$root}').getBoundingClientRect(); + + return Math.round(column.left) >= Math.round(edge + parseFloat(style.paddingLeft)) + && Math.round(column.right) <= Math.round(edge + board.clientWidth - parseFloat(style.paddingRight)); + })() + JS; + + $page->script("document.querySelector('.ff-columns').scrollLeft = {$scrollLeft}"); + + expect($page->script($inside))->toBeFalse(); + + $pointer->click("{$root} .ff-column-heading"); + $pointer->untilScript("document.querySelector('{$root} .fi-dropdown-panel').style.display === 'block'"); + $pointer->untilScript($inside); +})->with([ + 'cut off at the right' => ['in_progress', 0], + 'cut off at the left' => ['todo', 24], +]); + test('double clicking a header with a menu leaves the menu open and the column expanded', function (string $path) { boardSeed(); $page = boardPage($path);