chore: bump version to v3.31.0

also fixes an issue with cache not being set correctly when weapon hash is a negative number

fxmanifest.lua

@@ -6,7 +6,7 @@ rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aw
 
 name 'ox_lib'
 author 'Overextended'
-version '3.30.9'
+version '3.31.0'
 license 'LGPL-3.0-or-later'
 repository 'https://github.com/communityox/ox_lib'
 description 'A library of shared functions to utilise in other resources.'

package/bun.lock

@@ -4,7 +4,7 @@
     "": {
       "name": "@communityox/ox_lib",
       "dependencies": {
-        "@nativewrappers/client": "^1.7.33",
+        "@nativewrappers/fivem": "^0.0.103",
         "csstype": "^3.1.3",
         "fast-printf": "^1.6.9",
         "typescript": "^5.4.2",
@@ -97,7 +97,7 @@
 
     "@mantine/utils": ["@mantine/utils@6.0.22", "", { "peerDependencies": { "react": ">=16.8.0" } }, "sha512-RSKlNZvxhMCkOFZ6slbYvZYbWjHUM+PxDQnupIOxIdsTZQQjx/BFfrfJ7kQFOP+g7MtpOds8weAetEs5obwMOQ=="],
 
-    "@nativewrappers/client": ["@nativewrappers/client@1.7.33", "", {}, "sha512-phuBBGdDPxZiZyw5CaFs1XWfvllnEtwATMdLaNucwMofVg/O/FjlP1bTUq4SOm4qhSZ4Zdo351ijHzBSIbZs6g=="],
+    "@nativewrappers/fivem": ["@nativewrappers/fivem@0.0.103", "", {}, "sha512-x0W00Mx9ZN/rTS9XZc5Kf1hjahqRmlo9sPiuJP4kCYeQG4LDJyglXCsHcfNfygGq6WEblG1W2FLgm4MGDn/wHA=="],
 
     "@radix-ui/number": ["@radix-ui/number@1.0.0", "", { "dependencies": { "@babel/runtime": "^7.13.10" } }, "sha512-Ofwh/1HX69ZfJRiRBMTy7rgjAzHmwe4kW9C9Y99HTRUcYLUuVT0KESFj15rPjRgKJs20GPq8Bm5aEDJ8DuA3vA=="],
 

package/client/resource/interface/notify.ts

@@ -10,7 +10,7 @@ type NotificationPosition =
   | 'bottom-left'
   | 'center-right'
   | 'center-left';
-type NotificationType = 'inform' | 'error' | 'success';
+type NotificationType = 'inform' | 'error' | 'success' | 'warning';
 type IconAnimation = 'spin' | 'spinPulse' | 'spinReverse' | 'pulse' | 'beat' | 'fade' | 'beatFade' | 'bounce' | 'shake';
 
 interface NotifyProps {

package/client/resource/points/index.ts

@@ -1,4 +1,4 @@
-import { Vector3 } from '@nativewrappers/client';
+import { Vector3 } from '@nativewrappers/fivem';
 import { cache } from '../cache';
 
 let points: Point[] = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@communityox/ox_lib",
   "author": "Overextended",
-  "version": "3.30.9",
+  "version": "3.31.0",
   "description": "JS/TS wrapper for ox_lib exports",
   "main": "./shared/index.js",
   "types": "./shared/index.d.ts",
@@ -28,7 +28,7 @@
   },
   "license": "LGPL-3.0",
   "dependencies": {
-    "@nativewrappers/client": "^1.7.33",
+    "@nativewrappers/fivem": "^0.0.103",
     "csstype": "^3.1.3",
     "fast-printf": "^1.6.9",
     "typescript": "^5.4.2"

package/shared/resource/getNearbyVehicles/index.ts

@@ -1,6 +1,6 @@
 import { cache } from '../cache/index';
-import { context } from 'shared';
-import { Vector3 } from "@nativewrappers/client";
+import { context } from '../../index';
+import { Vector3 } from "@nativewrappers/fivem";
 
 interface NearbyVehicle {
     vehicle: number;

resource/cache/client.lua

@@ -29,40 +29,43 @@ local GetCurrentPedWeapon = GetCurrentPedWeapon
 CreateThread(function()
 	while true do
 		local ped = PlayerPedId()
-		cache:set('ped', ped)
 
-		local vehicle = GetVehiclePedIsIn(ped, false)
+		-- If the player's ped is changed, the ped value may return 0 during the transition. If the value is 0, skip all checks.
+		if ped ~= 0 then
+			cache:set('ped', ped)
 
-		if vehicle > 0 then
-			if vehicle ~= cache.vehicle then
+			local vehicle = GetVehiclePedIsIn(ped, false)
+
+			if vehicle > 0 then
+				if vehicle ~= cache.vehicle then
+					cache:set('seat', false)
+				end
+
+				cache:set('vehicle', vehicle)
+
+				if not cache.seat or GetPedInVehicleSeat(vehicle, cache.seat) ~= ped then
+					for i = -1, GetVehicleMaxNumberOfPassengers(vehicle) - 1 do
+						if GetPedInVehicleSeat(vehicle, i) == ped then
+							cache:set('seat', i)
+							break
+						end
+					end
+				end
+			else
+				cache:set('vehicle', false)
 				cache:set('seat', false)
 			end
 
-			cache:set('vehicle', vehicle)
-
-			if not cache.seat or GetPedInVehicleSeat(vehicle, cache.seat) ~= ped then
-				for i = -1, GetVehicleMaxNumberOfPassengers(vehicle) - 1 do
-					if GetPedInVehicleSeat(vehicle, i) == ped then
-						cache:set('seat', i)
-						break
-					end
-				end
+			if cache.game == 'redm' then
+				local mount = GetMount(ped)
+				local onMount = IsPedOnMount(ped)
+				cache:set('mount', onMount and mount or false)
 			end
-		else
-			cache:set('vehicle', false)
-			cache:set('seat', false)
+
+			local hasWeapon, currentWeapon = GetCurrentPedWeapon(ped, true)
+			cache:set('weapon', (hasWeapon and currentWeapon ~= 0) and currentWeapon or false)
 		end
 
-		if cache.game == 'redm' then
-			local mount = GetMount(ped)
-			local onMount = IsPedOnMount(ped)
-			cache:set('mount', onMount and mount or false)
-		end
-
-		local hasWeapon, currentWeapon = GetCurrentPedWeapon(ped, true)
-
-		cache:set('weapon', hasWeapon and currentWeapon or false)
-
 		Wait(100)
 	end
 end)

resource/interface/client/input.lua

@@ -30,9 +30,12 @@ local input
 ---@field searchable? boolean
 ---@field description? string
 ---@field maxSelectedValues? number
+---@field minLength? number
+---@field maxLength? number
 
 ---@class InputDialogOptionsProps
 ---@field allowCancel? boolean
+---@field size? 'xs' | 'sm' | 'md' | 'lg' | 'xl'
 
 ---@param heading string
 ---@param rows string[] | InputDialogRowProps[]

web/src/features/dev/debug/notification.ts

@@ -26,6 +26,7 @@ export const debugCustomNotification = () => {
         title: 'Error',
         description: 'Notification description',
         type: 'error',
+        position: "bottom"
       },
     },
   ]);

web/src/features/dialog/InputDialog.tsx

@@ -103,7 +103,7 @@ const InputDialog: React.FC = () => {
         centered
         closeOnEscape={fields.options?.allowCancel !== false}
         closeOnClickOutside={false}
-        size="xs"
+        size={fields.options?.size || 'xs'}
         styles={{ title: { textAlign: 'center', width: '100%', fontSize: 18 } }}
         title={fields.heading}
         withCloseButton={false}

web/src/features/dialog/components/fields/textarea.tsx

@@ -24,6 +24,8 @@ const TextareaField: React.FC<Props> = (props) => {
       autosize={props.row.autosize}
       minRows={props.row.min}
       maxRows={props.row.max}
+      minLength={props.row.minLength}
+      maxLength={props.row.maxLength}
     />
   );
 };

web/src/features/notifications/NotificationWrapper.tsx

@@ -61,7 +61,7 @@ const getAnimation = (visible: boolean, position: string) => {
       animation = { from: 'X(0px)', to: 'X(-100%)' };
     } else if (position === 'top-center') {
       animation = { from: 'Y(0px)', to: 'Y(-100%)' };
-    } else if (position === 'bottom') {
+    } else if (position === 'bottom-center') {
       animation = { from: 'Y(0px)', to: 'Y(100%)' };
     } else {
       animation = { from: 'X(0px)', to: 'X(100%)' };

web/src/typings/dialog.ts

@@ -5,6 +5,7 @@ export interface InputProps {
   rows: Array<IInput | ICheckbox | ISelect | INumber | ISlider | IColorInput | IDateInput | ITextarea | ITimeInput>;
   options?: {
     allowCancel?: boolean;
+    size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
   };
 }
 
@@ -76,4 +77,6 @@ export interface ITextarea extends BaseField<'textarea', string> {
   autosize?: boolean;
   min?: number;
   max?: number;
+  minLength?: number;
+  maxLength?: number;
 }