fix(Dimensions.removeEventListener): implements more simple condition…

… for choosing a way of removing a listener
zheoreh · Nov 29, 2023 · 5002417 · 5002417
1 parent 9761dcf
commit 5002417
Show file tree

Hide file tree

Showing 6 changed files with 23,917 additions and 32,415 deletions.
diff --git a/packages/app/client/helpers/useMediaUpdate.js b/packages/app/client/helpers/useMediaUpdate.js
@@ -17,7 +17,7 @@ export default function useMediaUpdate () {
     const listener = Dimensions.addEventListener('change', debouncedChangeDimensions)
     return () => {
       // removeEventListener has been removed from rn 0.70.4
-      if (listener && !Dimensions.removeEventListener) {
+      if (listener) {
         listener.remove()
       } else {
         Dimensions.removeEventListener('change', debouncedChangeDimensions)

diff --git a/packages/ui/components/SmartSidebar/index.js b/packages/ui/components/SmartSidebar/index.js
@@ -45,7 +45,7 @@ function SmartSidebar ({
   let onChange
   ;({ open, onChange } = useBind({ $open, open, onChange }))
 
-  let [fixedLayout, $fixedLayout] = useValue(isFixedLayout(fixedLayoutBreakpoint))
+  const [fixedLayout, $fixedLayout] = useValue(isFixedLayout(fixedLayoutBreakpoint))
 
   useLayoutEffect(() => {
     if (!fixedLayout) return
@@ -73,7 +73,7 @@ function SmartSidebar ({
     const listener = Dimensions.addEventListener('change', handleWidthChange)
     return () => {
       // removeEventListener has been removed from rn 0.70.4
-      if (listener && !Dimensions.removeEventListener) {
+      if (listener) {
         listener.remove()
       } else {
         Dimensions.removeEventListener('change', handleWidthChange)
@@ -135,6 +135,6 @@ SmartSidebar.propTypes = {
 export default observer(themed('SmartSidebar', SmartSidebar))
 
 function isFixedLayout (fixedLayoutBreakpoint) {
-  let dim = Dimensions.get('window')
+  const dim = Dimensions.get('window')
   return dim.width > fixedLayoutBreakpoint
 }
diff --git a/packages/ui/components/popups/Dropdown/index.js b/packages/ui/components/popups/Dropdown/index.js
@@ -68,7 +68,7 @@ function Dropdown ({
     return () => {
       $isShow.del()
       // removeEventListener has been removed from rn 0.70.4
-      if (listener && !Dimensions.removeEventListener) {
+      if (listener) {
         listener.remove()
       } else {
         Dimensions.removeEventListener('change', handleWidthChange)

diff --git a/packages/ui/components/popups/Popover/Deprecated/index.js b/packages/ui/components/popups/Popover/Deprecated/index.js
@@ -98,7 +98,7 @@ function Popover ({
     return () => {
       mounted = false
       // removeEventListener has been removed from rn 0.70.4
-      if (listener && !Dimensions.removeEventListener) {
+      if (listener) {
         listener.remove()
       } else {
         Dimensions.removeEventListener('change', handleDimensions)
@@ -197,7 +197,7 @@ function Popover ({
 
   // parse children
   let caption = null
-  let content = []
+  const content = []
   const onLayoutCaption = e => {
     captionInfo.current = e.nativeEvent.layout
   }

diff --git a/packages/ui/hooks/useMedia.js b/packages/ui/hooks/useMedia.js
@@ -36,6 +36,5 @@ function updateMediaFlags ({ window }) {
 
 function listenForMediaUpdates () {
   updateMediaFlags({ window: Dimensions.get('window') })
-  // todo: что на счет удаления слушателя?
   Dimensions.addEventListener('change', debouncedUpdateMedia)
 }