Skip to content

Commit 98f3ac8

Browse files
authored
Refactor View into Core module (#134)
* Refactor View into Core module * Update Test case issue * Fix iOS build issue
1 parent 019330b commit 98f3ac8

File tree

153 files changed

+408
-435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+408
-435
lines changed

Sources/COpenSwiftUI/empty.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//
22
// ProtocolDescriptor.c
3-
// FIXME: Use ProtocolDescriptor.m due to COpenSwiftUICore module contains ObjC symbol.
4-
// Solution: Move down to COpenSwiftUICore module.
5-
// COpenSwiftUI
6-
3+
// COpenSwiftUICore
74

85
#include "ProtocolDescriptor.h"
96

@@ -13,15 +10,15 @@ void _OpenSwiftUI_callVisitViewType(void *visitor_value,
1310
const void *view_pwt);
1411

1512
OPENSWIFTUI_EXPORT
16-
const void *$s11OpenSwiftUI4ViewMp;
13+
const void *$s15OpenSwiftUICore4ViewMp;
1714

1815
const void *_OpenSwiftUI_viewProtocolDescriptor(void) {
19-
return &$s11OpenSwiftUI4ViewMp;
16+
return &$s15OpenSwiftUICore4ViewMp;
2017
}
2118

2219
OPENSWIFTUI_EXPORT
23-
const void *$s11OpenSwiftUI12ViewModifierMp;
20+
const void *$s15OpenSwiftUICore12ViewModifierMp;
2421

2522
const void *_OpenSwiftUI_viewModifierProtocolDescriptor(void) {
26-
return &$s11OpenSwiftUI12ViewModifierMp;
23+
return &$s15OpenSwiftUICore12ViewModifierMp;
2724
}

Sources/OpenSwiftUI/App/AppGraph.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Glibc
1414
import WASILibc
1515
#endif
1616
internal import OpenGraphShims
17-
@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
17+
@_spi(ForOpenSwiftUIOnly) package import OpenSwiftUICore
1818

1919
package final class AppGraph: GraphHost {
2020
static var shared: AppGraph? = nil

Sources/OpenSwiftUI/App/OpenSwiftUIApplication.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Status: WIP
77
// ID: ACC2C5639A7D76F611E170E831FCA491
88

9-
@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
9+
@_spi(ForOpenSwiftUIOnly) internal import OpenSwiftUICore
1010

1111
#if os(iOS) || os(tvOS)
1212
import UIKit

Sources/OpenSwiftUI/Core/Render/DisplayLink.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import UIKit
1414
import AppKit
1515
#endif
1616

17-
@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
17+
@_spi(ForOpenSwiftUIOnly) internal import OpenSwiftUICore
1818

1919
final class DisplayLink: NSObject {
2020
private weak var host: AnyUIHostingView?

Sources/OpenSwiftUI/Core/Util/Comparable+Extension.swift

Lines changed: 0 additions & 21 deletions
This file was deleted.

Sources/OpenSwiftUI/Core/View/View/ViewInputs.swift

Lines changed: 0 additions & 144 deletions
This file was deleted.

Sources/OpenSwiftUI/EventHandling/Focus/FocusState.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Status: WIP
77
// ID: 274D264A38B51DC68ACC48A91353B7D0
88

9-
@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
9+
@_spi(ForOpenSwiftUIOnly) public import OpenSwiftUICore
1010

1111
@frozen
1212
@propertyWrapper

0 commit comments

Comments
 (0)