Added methods to handle currently selected tab state with imperative syntax.

jasudev · jasudev · commit 4a9a9c6c5b32 · 2022-03-31T09:54:05.000+09:00
diff --git a/AxisSegmentedViewExample/Shared/CustomStyleView.swift b/AxisSegmentedViewExample/Shared/CustomStyleView.swift
@@ -34,6 +34,11 @@ struct CustomStyleView: View {
                     }
             } style: {
                 CustomStyle(color: .blue)
+            } onTapReceive: { selectionTap in
+                /// Imperative syntax
+                print("---------------------")
+                print("Selection : ", selectionTap)
+                print("Already selected : ", self.selection == selectionTap)
             }
             .frame(width: 44)
             
@@ -56,6 +61,11 @@ struct CustomStyleView: View {
                     }
             } style: {
                 CustomStyle(color: .red)
+            } onTapReceive: { selectionTap in
+                /// Imperative syntax
+                print("---------------------")
+                print("Selection : ", selectionTap)
+                print("Already selected : ", self.selection == selectionTap)
             }
             .frame(height: 44)
         }
diff --git a/AxisSegmentedViewExample/Shared/SegmentedViewWithControl.swift b/AxisSegmentedViewExample/Shared/SegmentedViewWithControl.swift
@@ -50,11 +50,16 @@ struct SegmentedViewWithControl<Tabs: View, Style: View> : View {
     }
     
     private var segmentedView: some View {
-        AxisSegmentedView(selection: $selection, constant: constant, {
+        AxisSegmentedView(selection: $selection, constant: constant) {
             tabs()
-        }, style: {
+        } style: {
             style()
-        })
+        } onTapReceive: { selectionTap in
+            /// Imperative syntax
+            print("---------------------")
+            print("Selection : ", selectionTap)
+            print("Already selected : ", self.selection == selectionTap)
+        }
         .font(.system(size: 20))
     }
     
diff --git a/AxisSegmentedViewExample/Shared/WithoutStyleView.swift b/AxisSegmentedViewExample/Shared/WithoutStyleView.swift
@@ -21,10 +21,20 @@ struct WithoutStyleView: View {
         VStack {
             AxisSegmentedView(selection: $selection1, constant: constant1) {
                 TabViews()
+            } onTapReceive: { selectionTap in
+                /// Imperative syntax
+                print("---------------------")
+                print("Selection : ", selectionTap)
+                print("Already selected : ", self.selection1 == selectionTap)
             }
             .clipped()
             AxisSegmentedView(selection: $selection2, constant: constant2) {
                 TabViews()
+            } onTapReceive: { selectionTap in
+                /// Imperative syntax
+                print("---------------------")
+                print("Selection : ", selectionTap)
+                print("Already selected : ", self.selection2 == selectionTap)
             }
             .clipped()
         }
diff --git a/README.md b/README.md
@@ -42,6 +42,11 @@ AxisSegmentedView(selection: $selection, constant: .init()) {
         }
 } style: {
     ASBasicStyle()
+} onTapReceive: { selectionTap in
+    /// Imperative syntax
+    print("---------------------")
+    print("Selection : ", selectionTap)
+    print("Already selected : ", self.selection == selectionTap)
 }
 .frame(height: 44)
 ```
diff --git a/Sources/AxisSegmentedView/AxisSegmentedView.swift b/Sources/AxisSegmentedView/AxisSegmentedView.swift
@@ -107,12 +107,14 @@ public extension AxisSegmentedView where SelectionValue: Hashable, Content: View
     ///   - constant: A constant value for segmented view.
     ///   - content: Content views with tab items applied.
     ///   - style: The style of the segmented view.
+    ///   - onTapReceive: Method that treats the currently selected tab as imperative syntax.
     init(selection: Binding<SelectionValue>,
          constant: ASConstant = .init(),
          @ViewBuilder _ content: @escaping () -> Content,
-         @ViewBuilder style: @escaping () -> Style) {
+         @ViewBuilder style: @escaping () -> Style,
+         onTapReceive: ((SelectionValue) -> Void)? = nil) {
         
-        self.selectionValue = ASSelectionValue(selection: selection)
+        self.selectionValue = ASSelectionValue(selection: selection, onTapReceive: onTapReceive)
         self.constant = constant
         self.style = style
         self.content = content
@@ -126,11 +128,13 @@ public extension AxisSegmentedView where SelectionValue: Hashable, Content: View
     ///   - selection: The currently selected tap value.
     ///   - constant: A constant value for segmented view.
     ///   - content: Content views with tab items applied.
+    ///   - onTapReceive: Method that treats the currently selected tab as imperative syntax.
     init(selection: Binding<SelectionValue>,
          constant: ASConstant = .init(),
-         @ViewBuilder _ content: @escaping () -> Content) {
+         @ViewBuilder _ content: @escaping () -> Content,
+         onTapReceive: ((SelectionValue) -> Void)? = nil) {
         
-        self.selectionValue = ASSelectionValue(selection: selection)
+        self.selectionValue = ASSelectionValue(selection: selection, onTapReceive: onTapReceive)
         self.constant = constant
         self.content = content
     }
diff --git a/Sources/AxisSegmentedView/Private/Modifiers/ASItemModifier.swift b/Sources/AxisSegmentedView/Private/Modifiers/ASItemModifier.swift
@@ -44,23 +44,31 @@ struct ASItemModifier<SelectionValue: Hashable, S: View>: ViewModifier {
     var selectArea: CGFloat
     var select: S? = nil
     
+    private var selection: Binding<SelectionValue> { Binding(
+        get: { self.selectionValue.selection },
+        set: {
+            self.selectionValue.onTapReceive?($0)
+            self.selectionValue.selection = $0
+        })
+    }
+    
     var normalSize: CGSize {
         if positionValue.constant.axisMode == .horizontal {
-            return CGSize(width: positionValue.getNormalArea(selectionValue.selection),
+            return CGSize(width: positionValue.getNormalArea(self.selection.wrappedValue),
                           height: positionValue.size.height)
         }else {
             return CGSize(width: positionValue.size.width,
-                          height: positionValue.getNormalArea(selectionValue.selection))
+                          height: positionValue.getNormalArea(self.selection.wrappedValue))
         }
     }
     
     var selectSize: CGSize {
         if positionValue.constant.axisMode == .horizontal {
-            return CGSize(width: positionValue.getSelectArea(selectionValue.selection),
+            return CGSize(width: positionValue.getSelectArea(self.selection.wrappedValue),
                           height: positionValue.size.height)
         }else {
             return CGSize(width: positionValue.size.width,
-                          height: positionValue.getSelectArea(selectionValue.selection))
+                          height: positionValue.getSelectArea(self.selection.wrappedValue))
         }
     }
     
@@ -85,7 +93,7 @@ struct ASItemModifier<SelectionValue: Hashable, S: View>: ViewModifier {
         ZStack {
             if positionValue.isHasStyle {
                 Button {
-                    self.selectionValue.selection = tag
+                    self.selection.wrappedValue = tag
                     self.stateValue.isInitialRun = false
                     if positionValue.constant.isActivatedVibration { vibration() }
                 } label: {
@@ -100,19 +108,19 @@ struct ASItemModifier<SelectionValue: Hashable, S: View>: ViewModifier {
             }else {
                 ZStack {
                     Button {
-                        self.selectionValue.selection = tag
+                        self.selection.wrappedValue = tag
                         self.stateValue.isInitialRun = false
                         if positionValue.constant.isActivatedVibration { vibration() }
                     } label: {
                         content
                     }
                     .contentShape(Rectangle())
                     .buttonStyle(.plain)
-                    .opacity(tag != selectionValue.selection ? 1 : 0)
+                    .opacity(tag != self.selection.wrappedValue ? 1 : 0)
                     
                     select?
                         .contentShape(Rectangle())
-                        .opacity(tag == selectionValue.selection ? 1 : 0)
+                        .opacity(tag == self.selection.wrappedValue ? 1 : 0)
                     
                 }
                 .frame(width: getItemSize().width, height: getItemSize().height)
@@ -136,7 +144,7 @@ struct ASItemModifier<SelectionValue: Hashable, S: View>: ViewModifier {
         .onAppear {
             self.setupStateValue()
         }
-        .onChange(of: self.selectionValue.selection) { newValue in
+        .onChange(of: self.selection.wrappedValue) { newValue in
             self.setupStateValue()
         }
         .onChange(of: selectArea) { newValue in
@@ -147,15 +155,15 @@ struct ASItemModifier<SelectionValue: Hashable, S: View>: ViewModifier {
     
     private func getItemSize() -> CGSize {
         if positionValue.constant.axisMode == .horizontal {
-            return CGSize(width: tag == selectionValue.selection ? selectSize.width : normalSize.width, height: positionValue.size.height)
+            return CGSize(width: tag == self.selection.wrappedValue ? selectSize.width : normalSize.width, height: positionValue.size.height)
         }else {
-            return CGSize(width: positionValue.size.width, height: tag == selectionValue.selection ? selectSize.height : normalSize.height)
+            return CGSize(width: positionValue.size.width, height: tag == self.selection.wrappedValue ? selectSize.height : normalSize.height)
         }
     }
     
     private func isShowDivideLine() -> Bool {
         let currentIndex = positionValue.indexOfTag(tag)
-        let selectionIndex = positionValue.indexOfTag(selectionValue.selection)
+        let selectionIndex = positionValue.indexOfTag(self.selection.wrappedValue)
         if positionValue.constant.divideLine.isShowSelectionLine {
             return currentIndex != 0
         }else {
@@ -165,14 +173,14 @@ struct ASItemModifier<SelectionValue: Hashable, S: View>: ViewModifier {
     
     private func getItemView(_ content: Content) -> some View {
         ZStack {
-            if tag == selectionValue.selection {
+            if tag == self.selection.wrappedValue {
                 ZStack {
                     if let select = select {
                         select
                             .onAppear {
                                 DispatchQueue.main.async {
                                     stateValue.previousIndex = stateValue.selectionIndex
-                                    stateValue.previousFrame = positionValue.getSelectFrame(self.selectionValue.selection, selectionIndex: stateValue.selectionIndex)
+                                    stateValue.previousFrame = positionValue.getSelectFrame(self.selection.wrappedValue, selectionIndex: stateValue.selectionIndex)
                                     
                                     if positionValue.constant.axisMode == .horizontal {
                                         stateValue.otherSize = CGSize(width: normalSize.width, height: positionValue.size.height)
@@ -198,11 +206,11 @@ struct ASItemModifier<SelectionValue: Hashable, S: View>: ViewModifier {
     }
     
     private func setupStateValue() {
-        let selectionIndex = positionValue.indexOfTag(self.selectionValue.selection)
+        let selectionIndex = positionValue.indexOfTag(self.selection.wrappedValue)
         stateValue.constant = positionValue.constant
         stateValue.itemCount = positionValue.itemCount
         stateValue.selectionIndex = selectionIndex
-        stateValue.selectionFrame = positionValue.getSelectFrame(self.selectionValue.selection, selectionIndex: selectionIndex)
+        stateValue.selectionFrame = positionValue.getSelectFrame(self.selection.wrappedValue, selectionIndex: selectionIndex)
         stateValue.size = positionValue.size
     }
     
diff --git a/Sources/AxisSegmentedView/Private/ViewModel/ASSelectionValue.swift b/Sources/AxisSegmentedView/Private/ViewModel/ASSelectionValue.swift
@@ -30,13 +30,15 @@ class ASSelectionValue<SelectionValue: Hashable>: ObservableObject {
     
     /// The currently selected tap value.
     @Binding var selection: SelectionValue
+    var onTapReceive: ((SelectionValue) -> Void)?
     
     /// Initializes `ASSelectionValue`
     /// - Parameters:
     ///   - selection: The currently selected tap value.
-    init(selection: Binding<SelectionValue>) {
+    ///   - onTapReceive: Method that treats the currently selected tab as imperative syntax.
+    init(selection: Binding<SelectionValue>, onTapReceive: ((SelectionValue) -> Void)? = nil) {
         _selection = selection
-        
+        self.onTapReceive = onTapReceive
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,11 @@ struct CustomStyleView: View {`
`34`	`34`	`}`
`35`	`35`	`} style: {`
`36`	`36`	`CustomStyle(color: .blue)`
	`37`	`+ } onTapReceive: { selectionTap in`
	`38`	`+ /// Imperative syntax`
	`39`	`+ print("---------------------")`
	`40`	`+ print("Selection : ", selectionTap)`
	`41`	`+ print("Already selected : ", self.selection == selectionTap)`
`37`	`42`	`}`
`38`	`43`	`.frame(width: 44)`
`39`	`44`
`@@ -56,6 +61,11 @@ struct CustomStyleView: View {`
`56`	`61`	`}`
`57`	`62`	`} style: {`
`58`	`63`	`CustomStyle(color: .red)`
	`64`	`+ } onTapReceive: { selectionTap in`
	`65`	`+ /// Imperative syntax`
	`66`	`+ print("---------------------")`
	`67`	`+ print("Selection : ", selectionTap)`
	`68`	`+ print("Already selected : ", self.selection == selectionTap)`
`59`	`69`	`}`
`60`	`70`	`.frame(height: 44)`
`61`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,11 @@ AxisSegmentedView(selection: $selection, constant: .init()) {`
`42`	`42`	`}`
`43`	`43`	`} style: {`
`44`	`44`	`ASBasicStyle()`
	`45`	`+} onTapReceive: { selectionTap in`
	`46`	`+ /// Imperative syntax`
	`47`	`+ print("---------------------")`
	`48`	`+ print("Selection : ", selectionTap)`
	`49`	`+ print("Already selected : ", self.selection == selectionTap)`
`45`	`50`	`}`
`46`	`51`	`.frame(height: 44)`
`47`	`52`	```