Skip to content

Alert presenting vc master #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 17, 2021
Merged

Alert presenting vc master #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
085befd
android
HeyImChris Nov 18, 2021
85debff
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Nov 19, 2021
bfaa932
Scene support for alerts (#917)
HeyImChris Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion React/CoreModules/RCTAlertController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,16 @@ - (UIWindow *)alertWindow
- (void)show:(BOOL)animated completion:(void (^)(void))completion
{
[self.alertWindow makeKeyAndVisible];
[self.alertWindow.rootViewController presentViewController:self animated:animated completion:completion];

// [TODO(macOS GH#774)
// If the window is tracked by our application then it will show the alert
if ([[[UIApplication sharedApplication] windows] containsObject:self.alertWindow]) {
[self.alertWindow.rootViewController presentViewController:self animated:animated completion:completion];
} else {
// When using Scenes, we must present the alert from a view controller associated with a window in the Scene. A fresh window (i.e. _alertWindow) cannot show the alert.
[RCTPresentedViewController() presentViewController:self animated:animated completion:completion];
}
// TODO(macOS GH#774)]
}
#endif // ]TODO(macOS GH#774)

Expand Down
54 changes: 27 additions & 27 deletions android-patches/scripts/CopyToRepo.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
@if "%DEBUG%" == "" @echo off
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unintentional change?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mentioned this in another comment on the review. I think VSCode on Mac didn't like the current line endings. I can just fix them up now since they're already on my machine

set SOURCEDIR=%~dp0\..
set TARGETREPO=E:\github\ms-react-native-forpatch
set COPYDIST=1
REM Copy bundle
robocopy %SOURCEDIR%\bundle %TARGETREPO%\android-patches\bundle /S
REM Copy dist in case we need to debug from the repo.
IF '%COPYDIST%'=='1' (robocopy %SOURCEDIR%\dist %TARGETREPO%\android-patches\dist /S)
else (rmdir /S /Q %TARGETREPO%\android-patches\dist)
REM Copy grouped patches.
robocopy %SOURCEDIR%\patches-droid-office-grouped %TARGETREPO%\android-patches\patches-droid-office-grouped /S
REM Copy enough stuff so that we can reproduce the work somewhere else.
robocopy %SOURCEDIR%\src %TARGETREPO%\android-patches\src /S
robocopy %SOURCEDIR% %TARGETREPO%\android-patches package.json
robocopy %SOURCEDIR% %TARGETREPO%\android-patches webpack.config.js
robocopy %SOURCEDIR% %TARGETREPO%\android-patches tsconfig.json
robocopy %SOURCEDIR% %TARGETREPO%\android-patches tslint.json
robocopy %SOURCEDIR% %TARGETREPO%\android-patches .prettierrc
robocopy %SOURCEDIR% %TARGETREPO%\android-patches .gitignore
REM Copy scripts.
robocopy %SOURCEDIR%\scripts %TARGETREPO%\android-patches\scripts /S
@if "%DEBUG%" == "" @echo off

set SOURCEDIR=%~dp0\..
set TARGETREPO=E:\github\ms-react-native-forpatch
set COPYDIST=1

REM Copy bundle
robocopy %SOURCEDIR%\bundle %TARGETREPO%\android-patches\bundle /S

REM Copy dist in case we need to debug from the repo.
IF '%COPYDIST%'=='1' (robocopy %SOURCEDIR%\dist %TARGETREPO%\android-patches\dist /S)
else (rmdir /S /Q %TARGETREPO%\android-patches\dist)

REM Copy grouped patches.
robocopy %SOURCEDIR%\patches-droid-office-grouped %TARGETREPO%\android-patches\patches-droid-office-grouped /S

REM Copy enough stuff so that we can reproduce the work somewhere else.
robocopy %SOURCEDIR%\src %TARGETREPO%\android-patches\src /S
robocopy %SOURCEDIR% %TARGETREPO%\android-patches package.json
robocopy %SOURCEDIR% %TARGETREPO%\android-patches webpack.config.js
robocopy %SOURCEDIR% %TARGETREPO%\android-patches tsconfig.json
robocopy %SOURCEDIR% %TARGETREPO%\android-patches tslint.json
robocopy %SOURCEDIR% %TARGETREPO%\android-patches .prettierrc
robocopy %SOURCEDIR% %TARGETREPO%\android-patches .gitignore

REM Copy scripts.
robocopy %SOURCEDIR%\scripts %TARGETREPO%\android-patches\scripts /S
178 changes: 89 additions & 89 deletions gradlew.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
@rem
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this one

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mentioned this in another comment on the review. I think VSCode on Mac didn't like the current line endings. I can just fix them up now since they're already on my machine

@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
Loading