@quenty/contentproviderutils 7.0.0-canary.331.7eefa75.0 → 7.0.0-canary.367.e9fdcbc.0

package/CHANGELOG.md

@@ -3,7 +3,98 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [7.0.0-canary.331.7eefa75.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.1.0...@quenty/contentproviderutils@7.0.0-canary.331.7eefa75.0) (2023-02-27)
+# [7.0.0-canary.367.e9fdcbc.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.10.0...@quenty/contentproviderutils@7.0.0-canary.367.e9fdcbc.0) (2023-06-05)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+# [6.10.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.9.0...@quenty/contentproviderutils@6.10.0) (2023-05-26)
+
+
+### Bug Fixes
+
+* Fix dependencies ([67791a2](https://github.com/Quenty/NevermoreEngine/commit/67791a289c0956bf4947ac81bf792ee56496b3e8))
+
+
+### Features
+
+* Initial refactor of guis to use ValueObject instead of ValueObject ([723aba0](https://github.com/Quenty/NevermoreEngine/commit/723aba0208cae7e06c9d8bf2d8f0092d042d70ea))
+
+
+
+
+
+# [6.9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.8.0...@quenty/contentproviderutils@6.9.0) (2023-05-08)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+# [6.8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.7.1...@quenty/contentproviderutils@6.8.0) (2023-04-10)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+## [6.7.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.7.0...@quenty/contentproviderutils@6.7.1) (2023-04-07)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+# [6.7.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.6.0...@quenty/contentproviderutils@6.7.0) (2023-04-06)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+# [6.6.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.5.0...@quenty/contentproviderutils@6.6.0) (2023-04-03)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+# [6.5.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.4.0...@quenty/contentproviderutils@6.5.0) (2023-03-31)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+# [6.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.3.0...@quenty/contentproviderutils@6.4.0) (2023-03-06)
+
+
+### Features
+
+* Add ImageLabelLoaded ([b24af97](https://github.com/Quenty/NevermoreEngine/commit/b24af97b56fb11edd8577598a44bbcacdb31e98e))
+
+
+
+
+
+# [6.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.2.0...@quenty/contentproviderutils@6.3.0) (2023-03-05)
+
+**Note:** Version bump only for package @quenty/contentproviderutils
+
+
+
+
+
+# [6.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/contentproviderutils@6.1.0...@quenty/contentproviderutils@6.2.0) (2023-02-27)
 
 **Note:** Version bump only for package @quenty/contentproviderutils
 

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2022 Quenty
+Copyright (c) 2014-2023 James Onnen (Quenty)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/contentproviderutils",
-  "version": "7.0.0-canary.331.7eefa75.0",
+  "version": "7.0.0-canary.367.e9fdcbc.0",
   "description": "Utility functions to ensure that content is preloaded (wrapping calls in promises)",
   "keywords": [
     "Roblox",
@@ -27,11 +27,17 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/loader": "6.1.0",
-    "@quenty/promise": "7.0.0-canary.331.7eefa75.0"
+    "@quenty/baseobject": "6.2.1",
+    "@quenty/instanceutils": "7.14.0",
+    "@quenty/loader": "6.2.1",
+    "@quenty/maid": "2.5.0",
+    "@quenty/promise": "6.5.0",
+    "@quenty/rx": "7.11.0",
+    "@quenty/signal": "2.4.0",
+    "@quenty/valueobject": "8.0.0-canary.367.e9fdcbc.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7eefa756f8bd892b1210349a8133d6d56992dffb"
+  "gitHead": "e9fdcbc6ea1d46e068bf42a08b833099e9005259"
 }

package/src/Client/ImageLabelLoaded.lua

@@ -0,0 +1,143 @@
+--[=[
+	@class ImageLabelLoaded
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local BaseObject = require("BaseObject")
+local Promise = require("Promise")
+local Signal = require("Signal")
+local Maid = require("Maid")
+local ContentProviderUtils = require("ContentProviderUtils")
+local RxInstanceUtils = require("RxInstanceUtils")
+local Rx = require("Rx")
+local ValueObject = require("ValueObject")
+
+local ImageLabelLoaded = setmetatable({}, BaseObject)
+ImageLabelLoaded.ClassName = "ImageLabelLoaded"
+ImageLabelLoaded.__index = ImageLabelLoaded
+
+function ImageLabelLoaded.new()
+	local self = setmetatable(BaseObject.new(), ImageLabelLoaded)
+
+	self._isLoaded = ValueObject.new(false, "boolean")
+	self._maid:GiveTask(self._isLoaded)
+
+	self._defaultTimeout = 1
+
+	self._preloadImage = ValueObject.new(true, "boolean")
+	self._maid:GiveTask(self._preloadImage)
+
+	self.ImageChanged = Signal.new()
+	self._maid:GiveTask(self.ImageChanged)
+
+	return self
+end
+
+function ImageLabelLoaded:SetDefaultTimeout(defaultTimeout)
+	assert(type(defaultTimeout) == "number" or defaultTimeout == nil, "Bad defaultTimeout")
+
+	self._defaultTimeout = defaultTimeout
+end
+
+function ImageLabelLoaded:IsLoaded()
+	return self._isLoaded.Value
+end
+
+function ImageLabelLoaded:SetPreloadImage(preloadImage)
+	assert(type(preloadImage) == "boolean", "Bad preloadImage")
+
+	self._preloadImage.Value = preloadImage
+end
+
+function ImageLabelLoaded:PromiseLoaded(timeout)
+	assert(type(timeout) == "number" or timeout == nil, "Bad timeout")
+
+	local originalTimeout = timeout
+	timeout = timeout or self._defaultTimeout
+
+	if self._isLoaded.Value then
+		return Promise.resolved()
+	end
+
+	local promise = Promise.new()
+
+	local maid = Maid.new()
+	self._maid[promise] = maid
+
+	maid:GiveTask(self._isLoaded.Changed:Connect(function()
+		if self._isLoaded.Value then
+			promise:Resolve()
+		end
+	end))
+
+	maid:GiveTask(self.ImageChanged:Connect(function(isVisible)
+		if not isVisible then
+			promise:Reject()
+		end
+	end))
+
+	if timeout then
+		maid:GiveTask(task.delay(timeout, function()
+			if originalTimeout then
+				promise:Reject("[ImageLabelLoaded] - Failed to load image after default timeout time")
+			else
+				promise:Reject()
+			end
+		end))
+	end
+
+	promise:Finally(function()
+		self._maid[promise] = nil
+	end)
+
+	return promise
+end
+
+function ImageLabelLoaded:SetImageLabel(imageLabel)
+	assert(typeof(imageLabel) == "Instance" and imageLabel:IsA("ImageLabel") or imageLabel == nil, "Bad imageLabel")
+	if self._imageLabel == imageLabel then
+		return
+	end
+
+	local maid = Maid.new()
+
+	self._imageLabel = imageLabel
+
+	if self._imageLabel then
+		self._isLoaded.Value = self._imageLabel.IsLoaded
+
+		maid:GiveTask(self._imageLabel:GetPropertyChangedSignal("IsLoaded"):Connect(function()
+			self._isLoaded.Value = self._imageLabel.IsLoaded
+		end))
+
+		-- Setup preloading as necessary
+		maid:GiveTask(self._preloadImage:Observe():Pipe({
+			Rx.switchMap(function(preload)
+				if preload then
+					return Rx.combineLatest({
+						isLoaded = self._isLoaded;
+						image = RxInstanceUtils.observeProperty(self._imageLabel, "Image");
+					})
+				else
+					return Rx.EMPTY
+				end
+			end);
+		}):Subscribe(function(state)
+			if not state.isLoaded and state.image ~= "" then
+				maid:GivePromise(ContentProviderUtils.promisePreload({self._imageLabel}))
+					:Then(function()
+						self._isLoaded.Value = true
+					end)
+			end
+		end))
+	else
+		self._isLoaded.Value = false
+	end
+
+	self.ImageChanged:Fire()
+
+	self._maid._imageLabelMaid = maid
+end
+
+return ImageLabelLoaded