Skip to content

Commit 3df71b9

Browse files
authored
fix: 🐛 [HCPSDKFIORIUIKIT-3032] remove HStack from tool bar (#1241)
Remove HStack container and keep items separately.
1 parent 181387c commit 3df71b9

File tree

1 file changed

+21
-24
lines changed

1 file changed

+21
-24
lines changed

Sources/FioriSwiftUICore/Views/Toolbar/FioriToolbar.swift

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,32 @@ struct FioriToolbar<Items: IndexedViewContainer>: ViewModifier {
5858
Spacer()
5959
}
6060
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)
7869
}
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)
7977
}
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)
8684
}
8785
}
8886
}
89-
.frame(minWidth: 0, maxWidth: self.sizeHandler.itemsCurrentWidth)
9087
} else {
9188
LazyHStack(spacing: self.sizeHandler.defaultFixedPadding) {
9289
self.helperTextView()

0 commit comments

Comments
 (0)