microsoft · pavelfeldman · Sep 28, 2020 · Sep 28, 2020
diff --git a/api.json b/api.json
diff --git a/driver/package.json b/driver/package.json
@@ -13,7 +13,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright": "1.4.0"
+    "playwright": "1.4.2"
   },
   "devDependencies": {
     "pkg": "^4.4.9"

diff --git a/playwright/async_api.py b/playwright/async_api.py
diff --git a/playwright/element_handle.py b/playwright/element_handle.py
@@ -180,7 +180,7 @@ async def boundingBox(self) -> Optional[FloatRect]:
     async def screenshot(
         self,
         timeout: int = None,
-        type: Literal["png", "jpeg"] = None,
+        type: Literal["jpeg", "png"] = None,
         path: Union[str, Path] = None,
         quality: int = None,
         omitBackground: bool = None,
@@ -246,6 +246,23 @@ async def evalOnSelectorAll(
             )
         )
 
+    async def waitForElementState(
+        self,
+        state: Literal["disabled", "enabled", "hidden", "stable", "visible"],
+        timeout: int = None,
+    ) -> None:
+        await self._channel.send("waitForElementState", locals_to_params(locals()))
+
+    async def waitForSelector(
+        self,
+        selector: str,
+        state: Literal["attached", "detached", "hidden", "visible"] = None,
+        timeout: int = None,
+    ) -> Optional["ElementHandle"]:
+        return from_nullable_channel(
+            await self._channel.send("waitForSelector", locals_to_params(locals()))
+        )
+
 
 ValuesToSelect = Union[
     str,

diff --git a/playwright/frame.py b/playwright/frame.py
@@ -98,6 +98,9 @@ def _on_frame_navigated(self, event: FrameNavigatedEvent) -> None:
         if "error" not in event and hasattr(self, "_page") and self._page:
             self._page.emit("framenavigated", self)
 
+    def page(self) -> "Page":
+        return self._page
+
     async def goto(
         self,
         url: str,
@@ -234,7 +237,7 @@ async def waitForSelector(
         self,
         selector: str,
         timeout: int = None,
-        state: Literal["attached", "detached", "visible", "hidden"] = None,
+        state: Literal["attached", "detached", "hidden", "visible"] = None,
     ) -> Optional[ElementHandle]:
         return from_nullable_channel(
             await self._channel.send("waitForSelector", locals_to_params(locals()))

diff --git a/playwright/helper.py b/playwright/helper.py
@@ -45,10 +45,10 @@
 URLMatch = Union[str, Pattern, Callable[[str], bool]]
 RouteHandler = Callable[["Route", "Request"], Any]
 
-ColorScheme = Literal["light", "dark", "no-preference"]
-DocumentLoadState = Literal["load", "domcontentloaded", "networkidle"]
+ColorScheme = Literal["dark", "light", "no-preference"]
+DocumentLoadState = Literal["domcontentloaded", "load", "networkidle"]
 KeyboardModifier = Literal["Alt", "Control", "Meta", "Shift"]
-MouseButton = Literal["left", "right", "middle"]
+MouseButton = Literal["left", "middle", "right"]
 
 
 class MousePosition(TypedDict):
@@ -69,9 +69,9 @@ class SelectOption(TypedDict):
 
 
 class ConsoleMessageLocation(TypedDict):
-    url: Optional[str]
-    lineNumber: Optional[int]
-    columnNumber: Optional[int]
+    url: str
+    lineNumber: int
+    columnNumber: int
 
 
 class ErrorPayload(TypedDict, total=False):

diff --git a/playwright/page.py b/playwright/page.py
@@ -313,7 +313,7 @@ async def waitForSelector(
         self,
         selector: str,
         timeout: int = None,
-        state: Literal["attached", "detached", "visible", "hidden"] = None,
+        state: Literal["attached", "detached", "hidden", "visible"] = None,
     ) -> Optional[ElementHandle]:
         return await self._main_frame.waitForSelector(**locals_to_params(locals()))
 
@@ -503,7 +503,7 @@ async def goForward(
         )
 
     async def emulateMedia(
-        self, media: Literal["screen", "print"] = None, colorScheme: ColorScheme = None,
+        self, media: Literal["print", "screen"] = None, colorScheme: ColorScheme = None,
     ) -> None:
         await self._channel.send("emulateMedia", locals_to_params(locals()))
 
@@ -553,7 +553,7 @@ async def unroute(
     async def screenshot(
         self,
         timeout: int = None,
-        type: Literal["png", "jpeg"] = None,
+        type: Literal["jpeg", "png"] = None,
         path: Union[str, Path] = None,
         quality: int = None,
         omitBackground: bool = None,