Skip to content

Commit

Permalink
feat: notification width and position (#220)
Browse files Browse the repository at this point in the history
* feature: notification width and position 
* closes #216 && #218
Co-authored-by: PdoubleU <piotrwitasik1988@gmail.com>
  • Loading branch information
DominikDanielewicz committed Oct 31, 2023
1 parent 5fb63e8 commit b0358fa
Show file tree
Hide file tree
Showing 16 changed files with 202 additions and 37 deletions.
2 changes: 1 addition & 1 deletion docs/docs/intro/animations/changing-transitions.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 1
---

# 🪄 Transitions
# 🔄 Transitions

### 🎛 Changing transitions

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/intro/basics/basic-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 2
---

# 🪛 Basic configuration
# 🛠 Basic configuration

### Create Notifications

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ In the beginning, you can set the configuration for all the notifications used i

Let's take a look at what exactly can we set globally:

| Name | Type | Default | Description |
| --------------------- | :-------------------------: | :----------------------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| duration | Number | 3000 | Use this property to set how long the notifications should be displayed on the screen. Value expressed in milliseconds |
| notificationPosition | 'top' / 'center' / 'bottom' | 'top' | Set where the notifications should appear on the screen. You can choose one of three default options: top / center / bottom. To read more about the notification position please go to the [NOTIFICATION POSITION](../default-variants-config/position) section. |
| animationConfig | Object | SlideInLeftSlideOutRight | Property responsible for the notification animation. You can set one of the animations prepared by us, or make your own config. To read more about the animation settings please go to the [ANIMATIONS SETTINGS](../animations/changing-transitions) section. |
| isNotch | Boolean | false | Property responsible for read if the device has notch. You can use one of the libraries (for example 'react-native-device-info') to read if the specific device has Notch and pass the value here. |
| gestureConfig | Object | iOS: 'y' / android: 'x' | Object responsible for setting gesture direction that triggers swipe-dismiss of notification. To read more about gesture config, please go to the [GESTURE CONFIG](../default-variants-config/props-config) section. |
| defaultStylesSettings | Object | - | Object responsible for setting global styles for the notifications. You can also set here styles, for all the notifications of the specific type. For example for the error notifications. To read more about global style settings please go to the [GLOBAL STYLES SETTINGS](../default-variants-config/global-config) section. |
| Name | Type | Default | Description |
| --------------------- | :-------------------------------------------------------------------------------------: | :----------------------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| duration | Number | 3000 | Use this property to set how long the notifications should be displayed on the screen. Value expressed in milliseconds. |
| notificationPosition | 'top' / 'top-right' / 'top-left' / 'center' / 'bottom' / 'bottom-right' / 'bottom-left' | 'top' | Set where the notifications should appear on the screen. You can choose one of seven default options: top / top-right / top-left / center / bottom / bottom-right / bottom-left. To read more about the notification position please go to the [NOTIFICATION POSITION](../default-variants-config/position) section. |
| notificationWidth | Number | 343 | Use this property to set the width, in pixels, of the notifications that will be displayed on the screen. |
| animationConfig | Object | SlideInLeftSlideOutRight | Property responsible for the notification animation. You can set one of the animations prepared by us, or make your own config. To read more about the animation settings please go to the [ANIMATIONS SETTINGS](../animations/changing-transitions) section. |
| isNotch | Boolean | false | Property responsible for read if the device has notch. You can use one of the libraries (for example 'react-native-device-info') to read if the specific device has Notch and pass the value here. |
| gestureConfig | Object | iOS: 'y' / android: 'x' | Object responsible for setting gesture direction that triggers swipe-dismiss of notification. To read more about gesture config, please go to the [GESTURE CONFIG](../default-variants-config/props-config) section. |
| defaultStylesSettings | Object | - | Object responsible for setting global styles for the notifications. You can also set here styles, for all the notifications of the specific type. For example for the error notifications. To read more about global style settings please go to the [GLOBAL STYLES SETTINGS](../default-variants-config/global-config) section. |

<br/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ const { useNotifications, NotificationsProvider } = createNotifications({
isNotch: true,
duration: 30,
notificationPosition: 'top',
notificationWidth: 400,
animationConfig: SlideInLeftSlideOutRight,
defaultStylesSettings: {
darkMode: false,
Expand All @@ -139,6 +140,7 @@ All those properties:
- isNotch
- duration
- notificationPosition
- notificationWidth
- animationConfig

(defaultStylesSettings)
Expand Down Expand Up @@ -238,6 +240,7 @@ All those properties:
(config)

- notificationPosition
- notificationWidth
- animationConfig
- duration

Expand Down
11 changes: 7 additions & 4 deletions docs/docs/intro/default-variants-config/position.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@
sidebar_position: 2
---

# 🪄 Notification position
# 📌 Notification position

####

## 🎛 Changing position

You can change the position of the notifications displayed on the screen. <br/>
There are three possible options to choose from:
There are seven possible options to choose from:

- `top` - at the top of the screen
- `top-right` - at the top right of the screen
- `top-left` - at the top left of the screen
- `center` - at the middle of the screen (y-axis)
- `bottom`- at the bottom of the screen
- `bottom-right` - at the bottom right of the screen
- `bottom-left` - at the bottom left of the screen

The default setting for the `notificationPosition` is the `top` value.

Expand Down Expand Up @@ -52,15 +57,13 @@ export const ExampleNotification = () => {
</SafeAreaView>
)
}

```

Now all the notifications in the app will be displayed in the middle of the screen (y-axis) because we have set the `notificationPosition` value for the `center`.

<br/>
<br/>


### Set the position locally inside config object in a single notification instance:

```jsx
Expand Down
113 changes: 113 additions & 0 deletions docs/docs/intro/default-variants-config/width.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
---
sidebar_position: 2
---

# 📏 Notification width

####

## 🎛 Changing width

You can change the width of the notifications displayed on the screen. <br/>

By default, the `notificationWidth` is set to 343 pixels. If you don't specify a value for `notificationWidth`, notifications will default to this width.

If the value you provide for `notificationWidth` exceeds the device's width, the notification's width will be adjusted to the device width minus the margin value.

Depending on whether you want to change the notification width for the whole app or only change it for a certain notification, you can either:

<br/>

### Set the width for all notifications in the global config object:

```jsx
import React from 'react'
import { SafeAreaView, Text } from 'react-native'
import { createNotifications } from 'react-native-notificated'
import { styles } from './styles'

const { NotificationsProvider, useNotifications } = createNotifications({
notificationWidth: 400,
})

export const ExampleNotification = () => {
const { notify } = useNotifications()

return (
<SafeAreaView style={styles.container}>
<NotificationsProvider />
<Text
onPress={() =>
notify('error', {
params: {
description: 'This is where the toast text goes. ',
title: 'Error',
},
})
}>
Emit error
</Text>
</SafeAreaView>
)
}
```

"Now, all notifications in the application will be 400 pixels wide because we've set the `notificationWidth` value to 400."

<br/>
<br/>

### Set the position locally inside config object in a single notification instance:

```jsx
import React from 'react'
import { SafeAreaView, Text } from 'react-native'
import { createNotifications } from 'react-native-notificated'
import { styles } from './styles'

const { NotificationsProvider, useNotifications } = createNotifications({
notificationWidth: 400,
})

export const ExampleNotification = () => {
const { notify } = useNotifications()

return (
<SafeAreaView style={styles.container}>
<NotificationsProvider />
<Text
onPress={() =>
notify('error', {
params: {
description: 'This is where the toast text goes',
title: 'Error',
},
config: {
notificationWidth: 500,
},
})
}>
Emit error
</Text>
</SafeAreaView>
)
}
```

Now, all notifications in the app will be displayed with a width of 400 pixels, except for the `error` notification mentioned in the previous example.<br />
That `error` notification will have a width of 500 pixels because local configuration overrides the global setting.<br />
Of course, if you prefer, you can set the width locally without adjusting the global setting.<br/>
(You can read more about props overwriting in the [ORDER OF SETTINGS OVERWRITING](../comprehensive-configuration/order-of-settings-overwriting) section)

<br/>
<br/>

## 🔦 Width config priority

For each subsequent notification, the library looks for a notification width in the following order:

1. First, it looks for a config defined in `notify` payload
2. Secondly, it looks for a global config from `createNotification`
3. At last, when no config is found, it uses the default behavior, which is 343 pixels

<br/>
2 changes: 1 addition & 1 deletion docs/docs/intro/examples/custom-examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 5
---

# 🪶 Custom examples
# 🧭 Custom examples

<br/>

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/intro/examples/notification-in-modal-example.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 8
---

# 🪶 Notifcation In Modal Example
# 🔔 Notifcation In Modal Example

<br/>

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/intro/types/custom-components-examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 1
---

# 🪬 Specifying default types
# 🔧 Specifying default types

<br/>

Expand Down
2 changes: 1 addition & 1 deletion example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7651,4 +7651,4 @@ yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1:
string-width "^4.2.0"
which-module "^2.0.0"
y18n "^4.0.0"
yargs-parser "^18.1.2"
yargs-parser "^18.1.2"
9 changes: 5 additions & 4 deletions src/core/hooks/useNotificationsStates.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useReducer, useRef, useState } from 'react'
import { useWindowDimensions } from 'react-native'
import { useNotificationConfig } from './useNotificationConfig'
import { getTopOffset, mergeConfigs } from '../utils/pickers'
import { getNotificationOffset, mergeConfigs } from '../utils/pickers'
import { queueReducer } from '../utils/queueReducer'
import { useStatusBarHeightDetector } from './useStatusBarHeightDetector'

Expand All @@ -18,7 +18,7 @@ export const useNotificationsStates = () => {
const notificationEvent = notificationsQueue[0]
const config = mergeConfigs(globalConfig, notificationEvent)

const topOffset = getTopOffset({
const notificationOffset = getNotificationOffset({
globalConfig: config,
notificationHeight,
isPortraitMode,
Expand All @@ -29,13 +29,14 @@ export const useNotificationsStates = () => {
return {
config,
dispatch,
topOffset,
notificationOffset,
panHandlerRef,
notificationEvent,
notificationsQueue,
longPressHandlerRef,
setNotificationHeight,
isPortaitMode: isPortraitMode,
isPortrait: isPortraitMode,
notificationWidth: config.notificationWidth,
}
}

Expand Down
24 changes: 18 additions & 6 deletions src/core/renderers/GestureHandler.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ type Props = {
| 'longPressHandlerRef'
| 'panHandlerRef'
| 'setNotificationHeight'
| 'topOffset'
| 'isPortaitMode'
| 'notificationOffset'
| 'isPortrait'
| 'notificationWidth'
>
animationAPI: Pick<AnimationAPI, 'dragGestureHandler' | 'handleDragStateChange' | 'dragStyles'>
notificationTopPosition?: number
Expand All @@ -28,14 +29,23 @@ export const GestureHandler = ({
notificationTopPosition,
}: Props) => {
const { width } = useWindowDimensions()
const notificationWidth = state.isPortaitMode
? width - Constants.notificationSideMargin * 2
: Constants.maxNotificationWidth

const fullWidth = width - Constants.notificationSideMargin * 2

const initialNotificationWidth = state?.notificationWidth || Constants.maxNotificationWidth

const isWidthWithinBounds = initialNotificationWidth <= fullWidth

const notificationWidth = isWidthWithinBounds ? initialNotificationWidth : fullWidth

const top =
notificationTopPosition || notificationTopPosition === 0
? notificationTopPosition
: state.topOffset
: state.notificationOffset.top

const left = state.notificationOffset.left

const right = state.notificationOffset.right

return (
<PanGestureHandler
Expand All @@ -51,6 +61,8 @@ export const GestureHandler = ({
Constants.isAndroid ? styles.containerAndroid : styles.containerIos,
{
top,
left,
right,
width: notificationWidth,
},
]}>
Expand Down
Loading

0 comments on commit b0358fa

Please sign in to comment.