Merge branch 'master' into lanyi-expanded-agent-paper-main

3 files changed, 6 insertions, 14 deletions

diff --git a/src/client/views/collections/CollectionStackingView.scss b/src/client/views/collections/CollectionStackingView.scss
index 2cf361847..ec81eb305 100644
--- a/src/client/views/collections/CollectionStackingView.scss
+++ b/src/client/views/collections/CollectionStackingView.scss
@@ -18,7 +18,7 @@
     .collectionStackingView-columnDragger {
         width: 28px;
         height: 28px;
-        position: relative;
+        position: absolute;
         margin-left: -5px;
         z-index: 10;
         > svg {
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index fbdd23315..7ff90ee53 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -417,8 +417,8 @@ export class CollectionStackingView extends CollectionSubView<Partial<collection
                 className="collectionStackingView-columnDragger"
                 onPointerDown={this.columnDividerDown}
                 ref={this._draggerRef}
-                style={{ cursor: this._cursor, color: SettingsManager.userColor, left: `${NumCast(this.Document._layout_columnWidth) + this.xMargin}px` }}>
-                <FontAwesomeIcon icon="arrows-alt-h" />
+                style={{ cursor: this._cursor, color: SettingsManager.userColor, left: `${NumCast(this.Document._layout_columnWidth)}px` }}>
+                <FontAwesomeIcon icon="arrows-alt-h" size="sm" />
             </div>
         );
     }
@@ -563,7 +563,7 @@ export class CollectionStackingView extends CollectionSubView<Partial<collection
         const rows = () => (!this.isStackingView ? 1 : Math.max(1, Math.min(docList.length, Math.floor((this._props.PanelWidth() - 2 * this.xMargin) / (this.columnWidth + this.gridGap)))));
         return (
             <div key={(heading?.heading ?? '') + 'head'}>
-                {this._props.isContentActive() && !this.isStackingView && !this.chromeHidden ? this.columnDragger : null}
+                {!this.isStackingView && !this.chromeHidden ? this.columnDragger : null}
                 <div style={{ position: 'relative' }}>
                     <CollectionMasonryViewFieldRow
                         showHandle={first}
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 76b9fd8db..3e6aa777f 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -107,7 +107,6 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
     /**
      * The Freeformview below the cursor at the start of a gesture (that receives the pointerDown event).  Used by GestureOverlay to determine the doc a gesture should apply to.
      */
-    // eslint-disable-next-line no-use-before-define
     public static DownFfview: CollectionFreeFormView | undefined; // the first DocView that receives a pointerdown event.  used by GestureOverlay to determine the doc a gesture should apply to.
 
     private _clusters = new CollectionFreeFormClusters(this);
@@ -2204,10 +2203,6 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
 
     @observable private _regenerateLoading = false;
     @observable private _regenInput = '';
-    @observable private _canInteract = true;
-    @observable private _drawingFillInput = '';
-    @observable private _regenLoading = false;
-    @observable private _drawingFillLoading = false;
     @observable private _fireflyRefStrength = 0;
 
     componentAIView = () => {
@@ -2220,7 +2215,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
                         aria-label="Edit instructions input"
                         type="text"
                         value={this._regenInput || StrCast(this.Document.title)}
-                        onChange={action(e => this._canInteract && (this._regenInput = e.target.value))}
+                        onChange={action(e => (this._regenInput = e.target.value))}
                         placeholder={this._regenInput || StrCast(this.Document.title)}
                     />
                     <div className="imageBox-aiView-regenerate-createBtn">
@@ -2253,10 +2248,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
                             max={100}
                             number={this._fireflyRefStrength}
                             size={Size.XXSMALL}
-                            setNumber={undoable(
-                                action(val => this._canInteract && (this._fireflyRefStrength = val as number)),
-                                `${this.Document.title} button set from list`
-                            )}
+                            setNumber={undoable(action(val => (this._fireflyRefStrength = val as number)),`${this.Document.title} button set from list` )}
                             fillWidth
                         />
                     </div>