Port over to React Luau

.gitignore

@@ -1,13 +1,12 @@
 # Rojo
 sourcemap.json
-*.rbxl
-*.rbxlx
-*.rbxm
-*.rbxmx
 
 # Wally
 Packages/
 DevPackages/
 
 # MkDocs documentation
 site/
+
+# Builds
+dist/

.vscode/settings.json

@@ -10,5 +10,6 @@
     "tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji",
     "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format",
     "tag:yaml.org,2002:python/object/apply:pymdownx.slugs.slugify mapping"
-  ]
+  ],
+  "luau-lsp.sourcemap.rojoProjectFile": "package.project.json"
 }

develop.project.json

@@ -5,8 +5,8 @@
     "$className": "DataModel",
     "ReplicatedStorage": {
       "$className": "ReplicatedStorage",
-      "SatchelLoader": {
-        "$path": "models/SatchelLoader"
+      "Satchel": {
+        "$path": "models/Satchel"
       }
     }
   }

docs/installation.md

@@ -61,13 +61,6 @@ The Creator Store is the easiest way to install Satchel. It is a one-click insta
 
 You are expected to already have Wally setup in your Rojo project and basic knowledge on how to use Wally packages.
 
-!!! warning
-
-    Wally does not include the loader script so you need to [`#!lua require()`][require] Satchel to run:
-    ``` lua title="Satchel Loader"
-    require(script.Satchel)
-    ```
-
 1. Open your Rojo project in the code editor of your choice.
 
 1. In the `wally.toml` file, add the [latest Wally version for Satchel][Wally]. Your dependencies should look similar to this:

models/Satchel/Packages.project.json

@@ -0,0 +1,9 @@
+{
+  "name": "Packages",
+  "tree": {
+    "$path": "../../Packages",
+    "satchel": {
+      "$path": "../../default.project.json"
+    }
+  }
+}

package.project.json

@@ -2,6 +2,9 @@
   "name": "Satchel",
   "emitLegacyScripts": false,
   "tree": {
-    "$path": "models"
+    "$path": "models/Satchel",
+    "ThumbnailCamera": {
+      "$path": "models/ThumbnailCamera.model.json"
+    }
   }
 }

src/Api/closeInventory.luau

@@ -0,0 +1,13 @@
+--!strict
+
+local RunService = game:GetService("RunService")
+
+local bindableEvents = script.Parent.Parent.BindableEvents
+
+local function closeInventory()
+	assert(RunService:IsClient(), "closeInventory can only be called on the client")
+
+	bindableEvents.InventoryClosed:Fire()
+end
+
+return closeInventory

src/Api/getEnabled.luau

@@ -0,0 +1,16 @@
+--!strict
+
+local Players = game:GetService("Players")
+local RunService = game:GetService("RunService")
+
+local player = Players.LocalPlayer
+local playerGui = player:WaitForChild("PlayerGui")
+local screenGui = playerGui:WaitForChild("SatchelGui")
+
+local function getEnabled()
+	assert(RunService:IsClient(), "getEnabled can only be called on the client")
+
+	return screenGui.Enabled
+end
+
+return getEnabled

src/Api/getTopbarIcon.luau

@@ -0,0 +1,13 @@
+--!strict
+
+local RunService = game:GetService("RunService")
+
+local TopbarPlus = require(script.Parent.Parent.Parent.topbarplus)
+
+local function getTopbarIcon(): TopbarPlus.Icon?
+	assert(RunService:IsClient(), "getTopbarIcon can only be called on the client")
+
+	return TopbarPlus.getIcon("SatchelInventory")
+end
+
+return getTopbarIcon

src/Api/isInventoryOpen.luau

@@ -0,0 +1,23 @@
+--!strict
+
+local RunService = game:GetService("RunService")
+
+local bindableEvents = script.Parent.Parent.BindableEvents
+
+local inventoryOpen = false
+
+bindableEvents.InventoryOpened.Event:Connect(function()
+	inventoryOpen = true
+end)
+
+bindableEvents.InventoryClosed.Event:Connect(function()
+	inventoryOpen = false
+end)
+
+local function isInventoryOpen(): boolean
+	assert(RunService:IsClient(), "isInventoryOpen can only be called on the client")
+
+	return inventoryOpen
+end
+
+return isInventoryOpen

src/Api/openInventory.luau

@@ -0,0 +1,13 @@
+--!strict
+
+local RunService = game:GetService("RunService")
+
+local bindableEvents = script.Parent.Parent.BindableEvents
+
+local function openInventory()
+	assert(RunService:IsClient(), "openInventory can only be called on the client")
+
+	bindableEvents.InventoryOpened:Fire()
+end
+
+return openInventory

src/Api/setEnabled.luau

@@ -0,0 +1,23 @@
+--!strict
+
+local Players = game:GetService("Players")
+local RunService = game:GetService("RunService")
+
+local getTopbarIcon = require(script.Parent.getTopbarIcon)
+
+local player = Players.LocalPlayer
+local playerGui = player:WaitForChild("PlayerGui")
+local screenGui = playerGui:WaitForChild("SatchelGui")
+
+local function setEnabled(isEnabled: boolean)
+	assert(RunService:IsClient(), "setEnabled can only be called on the client")
+
+	screenGui.Enabled = isEnabled
+
+	local icon = getTopbarIcon()
+	if icon then
+		icon:setEnabled(isEnabled)
+	end
+end
+
+return setEnabled

src/Attribution.client.luau

@@ -18,8 +18,29 @@
 	Thank you for supporting Satchel.
 ]]
 
+local MarketplaceService = game:GetService("MarketplaceService")
 local RunService = game:GetService("RunService")
 
+local VERSION = "2.0.0"
+
+-- Print attribution. Do not modify without reading above
 if not RunService:IsStudio() then
-	print("💼 Running Satchel v1.4.1 by @WinnersTakesAll")
+	print(`💼 Running Satchel v{VERSION} by @WinnersTakesAll`)
+end
+
+-- Check for updates. You may modify the below
+local latestVersion: string?
+
+local success, result = pcall(function()
+	return MarketplaceService:GetProductInfoAsync(13947506401)
+end)
+
+if success then
+	latestVersion = string.match(result.Name, "v(%d+%.%d+%.%d+)")
+end
+
+if latestVersion and latestVersion ~= VERSION then
+	warn(
+		`A new version of Satchel (v{VERSION} -> v{latestVersion}) is available: https://create.roblox.com/store/asset/13947506401`
+	)
 end

src/BindableEvents/BackpackItemAdded.model.json

@@ -0,0 +1,3 @@
+{
+  "ClassName": "BindableEvent"
+}

src/BindableEvents/BackpackItemEquipped.model.json

@@ -0,0 +1,3 @@
+{
+  "ClassName": "BindableEvent"
+}

src/BindableEvents/BackpackItemRemoved.model.json

@@ -0,0 +1,3 @@
+{
+  "ClassName": "BindableEvent"
+}

src/BindableEvents/BackpackItemUnequipped.model.json

@@ -0,0 +1,3 @@
+{
+  "ClassName": "BindableEvent"
+}

src/BindableEvents/InventoryClosed.model.json

@@ -0,0 +1,3 @@
+{
+  "ClassName": "BindableEvent"
+}

src/BindableEvents/InventoryOpened.model.json

@@ -0,0 +1,3 @@
+{
+  "ClassName": "BindableEvent"
+}