@@ -349,17 +349,21 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
349349 }
350350
351351 // Handle the default to first Value case
352- if ( defaultToFirstItem ) {
353- // Set to first item if defaultToFirstItem is true
354- const firstItem : SelectValue = data [ 0 ]
355- ? ( groupby . map ( col => data [ 0 ] [ col ] ) as string [ ] )
356- : null ;
357- if ( firstItem ?. [ 0 ] !== undefined ) {
358- updateDataMask ( firstItem ) ;
352+ // Skip default values when clearAllTrigger is active to prevent
353+ // defaults from being applied during Clear All operation
354+ if ( ! clearAllTrigger ) {
355+ if ( defaultToFirstItem ) {
356+ // Set to first item if defaultToFirstItem is true
357+ const firstItem : SelectValue = data [ 0 ]
358+ ? ( groupby . map ( col => data [ 0 ] [ col ] ) as string [ ] )
359+ : null ;
360+ if ( firstItem ?. [ 0 ] !== undefined ) {
361+ updateDataMask ( firstItem ) ;
362+ }
363+ } else if ( formData ?. defaultValue ) {
364+ // Handle defalut value case
365+ updateDataMask ( formData . defaultValue ) ;
359366 }
360- } else if ( formData ?. defaultValue ) {
361- // Handle defalut value case
362- updateDataMask ( formData . defaultValue ) ;
363367 }
364368 } , [
365369 isDisabled ,
@@ -370,6 +374,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
370374 groupby ,
371375 col ,
372376 inverseSelection ,
377+ clearAllTrigger ,
373378 ] ) ;
374379
375380 useEffect ( ( ) => {
@@ -407,7 +412,9 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
407412 ? ( groupby . map ( col => data [ 0 ] [ col ] ) as string [ ] )
408413 : null ;
409414
415+ // Skip default value update when clearAllTrigger is active
410416 if (
417+ ! clearAllTrigger &&
411418 defaultToFirstItem &&
412419 Object . keys ( formData ?. extraFormData || { } ) . length &&
413420 filterState . value !== undefined &&
@@ -425,6 +432,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
425432 data ,
426433 JSON . stringify ( filterState . value ) ,
427434 isChangedByUser . current ,
435+ clearAllTrigger ,
428436 ] ) ;
429437
430438 useEffect ( ( ) => {
0 commit comments