From 6bc30a061a51fbe3a05cfb33e841a1614fe22d0c Mon Sep 17 00:00:00 2001
From: huangchengjie <huangchengjie@dm-ai.com>
Date: Wed, 9 Mar 2022 01:20:17 +0800
Subject: [PATCH 1/2] fix(layout-sider): support layout-sider trigger slot

---
 components/layout/Sider.tsx | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/components/layout/Sider.tsx b/components/layout/Sider.tsx
index 39b39935a3..81e9483559 100644
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@@ -142,15 +142,9 @@ export default defineComponent({
 
     return () => {
       const pre = prefixCls.value;
-      const {
-        collapsedWidth,
-        width,
-        reverseArrow,
-        zeroWidthTriggerStyle,
-        trigger,
-        collapsible,
-        theme,
-      } = props;
+      const { collapsedWidth, width, reverseArrow, zeroWidthTriggerStyle, collapsible, theme } =
+        props;
+      const trigger = props.trigger || (slots.trigger && slots.trigger());
       const rawWidth = collapsed.value ? collapsedWidth : width;
       // use "px" as fallback unit for width
       const siderWidth = isNumeric(rawWidth) ? `${rawWidth}px` : String(rawWidth);

From 185eb72fb2ec0a08a7d9457c7ab9d896cde640f9 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sat, 12 Mar 2022 10:05:14 +0800
Subject: [PATCH 2/2] fix: sider trigger support slot

---
 components/layout/Sider.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/layout/Sider.tsx b/components/layout/Sider.tsx
index 81e9483559..63e52295d3 100644
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@@ -142,9 +142,15 @@ export default defineComponent({
 
     return () => {
       const pre = prefixCls.value;
-      const { collapsedWidth, width, reverseArrow, zeroWidthTriggerStyle, collapsible, theme } =
-        props;
-      const trigger = props.trigger || (slots.trigger && slots.trigger());
+      const {
+        collapsedWidth,
+        width,
+        reverseArrow,
+        zeroWidthTriggerStyle,
+        trigger = slots.trigger?.(),
+        collapsible,
+        theme,
+      } = props;
       const rawWidth = collapsed.value ? collapsedWidth : width;
       // use "px" as fallback unit for width
       const siderWidth = isNumeric(rawWidth) ? `${rawWidth}px` : String(rawWidth);