@@ -241,10 +241,15 @@ export function generateSpreadPinOrderKeys(count: number): string[] {
241241export function planPinnedReorder ( input : {
242242 /** Thread ids in the desired visual order (after the move). */
243243 readonly orderedIds : readonly string [ ] ;
244+ /** Include retained keys from hidden rows; only orderedIds receive writes. */
244245 readonly keysById : ReadonlyMap < string , string | null | undefined > ;
245246 readonly movedId : string ;
246247} ) : ReadonlyArray < { readonly id : string ; readonly orderKey : string } > {
247248 const { orderedIds, keysById, movedId } = input ;
249+ const visibleIds = new Set ( orderedIds ) ;
250+ const reservedKeys = new Set (
251+ [ ...keysById ] . flatMap ( ( [ id , key ] ) => ( ! visibleIds . has ( id ) && key != null ? [ key ] : [ ] ) ) ,
252+ ) ;
248253 const movedIndex = orderedIds . indexOf ( movedId ) ;
249254 if ( movedIndex === - 1 ) return [ ] ;
250255 const beforeId = movedIndex > 0 ? orderedIds [ movedIndex - 1 ] : null ;
@@ -254,11 +259,14 @@ export function planPinnedReorder(input: {
254259 const beforeUsable = beforeId === null || beforeKey != null ;
255260 const afterUsable = afterId === null || afterKey != null ;
256261 if ( beforeUsable && afterUsable ) {
257- const key = pinOrderKeyBetween ( beforeKey , afterKey ) ;
262+ let key = pinOrderKeyBetween ( beforeKey , afterKey ) ;
263+ while ( key !== null && reservedKeys . has ( key ) ) key = pinOrderKeyBetween ( key , afterKey ) ;
258264 if ( key !== null ) return [ { id : movedId , orderKey : key } ] ;
259265 }
260266 // Keyless neighbor (or corrupt keys): rewrite the section in the new order.
261- const keys = generateSpreadPinOrderKeys ( orderedIds . length ) ;
267+ const keys = generateSpreadPinOrderKeys ( orderedIds . length + reservedKeys . size )
268+ . filter ( ( key ) => ! reservedKeys . has ( key ) )
269+ . slice ( 0 , orderedIds . length ) ;
262270 return orderedIds . flatMap ( ( id , index ) => {
263271 const key = keys [ index ] ! ;
264272 return keysById . get ( id ) === key ? [ ] : [ { id, orderKey : key } ] ;
0 commit comments