@@ -58,35 +58,32 @@ struct FioriToolbar<Items: IndexedViewContainer>: ViewModifier {
58
58
Spacer ( )
59
59
}
60
60
if self . sizeHandler. needLayoutSubviews {
61
- HStack ( spacing: 0 ) {
62
- ForEach ( 0 ..< self . sizeHandler. itemsWidth. count, id: \. self) { index in
63
- let itemIndex = self . sizeHandler. itemsWidth [ index] . 0
64
- let itemWidth = self . sizeHandler. itemsWidth [ index] . 1
65
- if itemIndex >= 0 {
66
- self . items. view ( at: itemIndex)
67
- . frame ( width: itemWidth)
68
- . onChange ( of: self . dynamicTypeSize) { _, _ in
69
- self . sizeHandler. calculateItemsSize ( self . dynamicTypeSize)
70
- }
71
- } else {
72
- if itemIndex == - 1 {
73
- self . helperTextView ( )
74
- . frame ( width: itemWidth)
75
- } else if itemIndex == - 2 {
76
- self . moreAction ( )
77
- . frame ( width: itemWidth)
61
+ ForEach ( 0 ..< self . sizeHandler. itemsWidth. count, id: \. self) { index in
62
+ let itemIndex = self . sizeHandler. itemsWidth [ index] . 0
63
+ let itemWidth = self . sizeHandler. itemsWidth [ index] . 1
64
+ if itemIndex >= 0 {
65
+ self . items. view ( at: itemIndex)
66
+ . frame ( width: itemWidth)
67
+ . onChange ( of: self . dynamicTypeSize) { _, _ in
68
+ self . sizeHandler. calculateItemsSize ( self . dynamicTypeSize)
78
69
}
70
+ } else {
71
+ if itemIndex == - 1 {
72
+ self . helperTextView ( )
73
+ . frame ( width: itemWidth)
74
+ } else if itemIndex == - 2 {
75
+ self . moreAction ( )
76
+ . frame ( width: itemWidth)
79
77
}
80
- if index < self . sizeHandler . itemsWidth . count - 1 {
81
- if itemIndex == - 1 || ! self . sizeHandler. useFixedPadding {
82
- Spacer ( ) . frame ( minWidth : 8 )
83
- } else {
84
- Spacer ( ) . frame ( width : self . sizeHandler . defaultFixedPadding )
85
- }
78
+ }
79
+ if index < self . sizeHandler. itemsWidth . count - 1 {
80
+ if itemIndex == - 1 || ! self . sizeHandler . useFixedPadding {
81
+ Spacer ( ) . frame ( minWidth : 8 )
82
+ } else {
83
+ Spacer ( ) . frame ( width : self . sizeHandler . defaultFixedPadding )
86
84
}
87
85
}
88
86
}
89
- . frame ( minWidth: 0 , maxWidth: self . sizeHandler. itemsCurrentWidth)
90
87
} else {
91
88
LazyHStack ( spacing: self . sizeHandler. defaultFixedPadding) {
92
89
self . helperTextView ( )
0 commit comments